1 diff -urN linux-2.6.22/arch/mips/Kconfig linux-2.6.22.new/arch/mips/Kconfig
2 --- linux-2.6.22/arch/mips/Kconfig 2007-07-09 01:32:17.000000000 +0200
3 +++ linux-2.6.22.new/arch/mips/Kconfig 2007-07-11 02:34:51.000000000 +0200
9 + bool "Texas Instruments AR7"
11 + select DMA_NONCOHERENT
14 + select SWAP_IO_SPACE
15 + select SYS_HAS_CPU_MIPS32_R1
16 + select SYS_HAS_EARLY_PRINTK
17 + select SYS_SUPPORTS_32BIT_KERNEL
18 + select SYS_SUPPORTS_LITTLE_ENDIAN
19 + select NEED_MULTIPLE_NODES
24 bool "Alchemy processor based machines"
26 diff -urN linux-2.6.22/arch/mips/kernel/setup.c linux-2.6.22.new/arch/mips/kernel/setup.c
27 --- linux-2.6.22/arch/mips/kernel/setup.c 2007-07-09 01:32:17.000000000 +0200
28 +++ linux-2.6.22.new/arch/mips/kernel/setup.c 2007-07-11 02:32:39.000000000 +0200
30 * Initialize the bootmem allocator. It also setup initrd related data
33 -#ifdef CONFIG_SGI_IP27
34 +#ifdef CONFIG_NEED_MULTIPLE_NODES
36 static void __init bootmem_init(void)
42 -#else /* !CONFIG_SGI_IP27 */
43 +#else /* !CONFIG_NEED_MULTIPLE_NODES */
45 static void __init bootmem_init(void)
51 -#endif /* CONFIG_SGI_IP27 */
52 +#endif /* CONFIG_NEED_MULTIPLE_NODES */
55 * arch_mem_init - initialize memory managment subsystem
56 diff -urN linux-2.6.22/arch/mips/kernel/traps.c linux-2.6.22.new/arch/mips/kernel/traps.c
57 --- linux-2.6.22/arch/mips/kernel/traps.c 2007-07-09 01:32:17.000000000 +0200
58 +++ linux-2.6.22.new/arch/mips/kernel/traps.c 2007-07-11 02:32:39.000000000 +0200
59 @@ -1051,11 +1051,6 @@
60 unsigned long exception_handlers[32];
61 unsigned long vi_handlers[64];
64 - * As a side effect of the way this is implemented we're limited
65 - * to interrupt handlers in the address range from
66 - * KSEG0 <= x < KSEG0 + 256mb on the Nevada. Oh well ...
68 void *set_except_vector(int n, void *addr)
70 unsigned long handler = (unsigned long) addr;
71 @@ -1063,9 +1058,15 @@
73 exception_handlers[n] = handler;
74 if (n == 0 && cpu_has_divec) {
75 - *(volatile u32 *)(ebase + 0x200) = 0x08000000 |
76 - (0x03ffffff & (handler >> 2));
77 - flush_icache_range(ebase + 0x200, ebase + 0x204);
78 + /* lui k0, 0x0000 */
79 + *(volatile u32 *)(CAC_BASE+0x200) = 0x3c1a0000 | (handler >> 16);
80 + /* ori k0, 0x0000 */
81 + *(volatile u32 *)(CAC_BASE+0x204) = 0x375a0000 | (handler & 0xffff);
83 + *(volatile u32 *)(CAC_BASE+0x208) = 0x03400008;
85 + *(volatile u32 *)(CAC_BASE+0x20C) = 0x00000000;
86 + flush_icache_range(CAC_BASE+0x200, CAC_BASE+0x210);
88 return (void *)old_handler;
90 diff -urN linux-2.6.22/arch/mips/Makefile linux-2.6.22.new/arch/mips/Makefile
91 --- linux-2.6.22/arch/mips/Makefile 2007-07-09 01:32:17.000000000 +0200
92 +++ linux-2.6.22.new/arch/mips/Makefile 2007-07-11 02:32:39.000000000 +0200
97 +# Texas Instruments AR7
99 +core-$(CONFIG_AR7) += arch/mips/ar7/
100 +cflags-$(CONFIG_AR7) += -Iinclude/asm-mips/ar7
101 +load-$(CONFIG_AR7) += 0xffffffff94100000
104 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
106 core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/