upgrade wireless-tools and iproute2
[openwrt/svn-archive/archive.git] / openwrt / package / linux / kernel-patches / 012-arch_mips_kernel_traps_c
1 --- linux-mips-cvs/arch/mips/kernel/traps.c 2004-11-22 14:38:23.000000000 +0100
2 +++ linux-broadcom/arch/mips/kernel/traps.c 2005-01-31 13:13:14.000000000 +0100
3 @@ -919,6 +919,7 @@
4 void __init trap_init(void)
5 {
6 extern char except_vec1_generic;
7 + extern char except_vec2_generic;
8 extern char except_vec3_generic, except_vec3_r4000;
9 extern char except_vec_ejtag_debug;
10 extern char except_vec4;
11 @@ -926,6 +927,7 @@
12
13 /* Copy the generic exception handler code to it's final destination. */
14 memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80);
15 + memcpy((void *)(KSEG0 + 0x100), &except_vec2_generic, 0x80);
16
17 /*
18 * Setup default vectors
19 @@ -984,6 +986,12 @@
20 set_except_vector(13, handle_tr);
21 set_except_vector(22, handle_mdmx);
22
23 + if (current_cpu_data.cputype == CPU_SB1) {
24 + /* Enable timer interrupt and scd mapped interrupt */
25 + clear_c0_status(0xf000);
26 + set_c0_status(0xc00);
27 + }
28 +
29 if (cpu_has_fpu && !cpu_has_nofpuex)
30 set_except_vector(15, handle_fpe);
31