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_KGDB
19 + select SYS_SUPPORTS_LITTLE_ENDIAN
20 + select SYS_SUPPORTS_BIG_ENDIAN
24 bool "Alchemy processor based machines"
26 diff -urN linux-2.6.22/arch/mips/kernel/traps.c linux-2.6.22.new/arch/mips/kernel/traps.c
27 --- linux-2.6.22/arch/mips/kernel/traps.c 2007-07-09 01:32:17.000000000 +0200
28 +++ linux-2.6.22.new/arch/mips/kernel/traps.c 2007-07-11 02:32:39.000000000 +0200
29 @@ -1075,9 +1075,23 @@ void *set_except_vector(int n, void *addr)
31 exception_handlers[n] = handler;
32 if (n == 0 && cpu_has_divec) {
34 + /* lui k0, 0x0000 */
35 + *(volatile u32 *)(ebase + 0x200) =
36 + 0x3c1a0000 | (handler >> 16);
37 + /* ori k0, 0x0000 */
38 + *(volatile u32 *)(ebase + 0x204) =
39 + 0x375a0000 | (handler & 0xffff);
41 + *(volatile u32 *)(ebase + 0x208) = 0x03400008;
43 + *(volatile u32 *)(ebase + 0x20C) = 0x00000000;
44 + flush_icache_range(ebase + 0x200, ebase + 0x210);
46 *(volatile u32 *)(ebase + 0x200) = 0x08000000 |
47 (0x03ffffff & (handler >> 2));
48 flush_icache_range(ebase + 0x200, ebase + 0x204);
51 return (void *)old_handler;
54 diff -urN linux-2.6.22/arch/mips/Makefile linux-2.6.22.new/arch/mips/Makefile
55 --- linux-2.6.22/arch/mips/Makefile 2007-07-09 01:32:17.000000000 +0200
56 +++ linux-2.6.22.new/arch/mips/Makefile 2007-07-11 02:32:39.000000000 +0200
61 +# Texas Instruments AR7
63 +core-$(CONFIG_AR7) += arch/mips/ar7/
64 +cflags-$(CONFIG_AR7) += -Iinclude/asm-mips/ar7
65 +load-$(CONFIG_AR7) += 0xffffffff94100000
68 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
70 core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
71 diff -urN linux-2.6.22.4/include/asm-mips/page.h linux-2.6.22.4.new/include/asm-mips/page.h
72 --- linux-2.6.22.4/include/asm-mips/page.h 2007-08-21 12:33:06.000000000 +0800
73 +++ linux-2.6.22.4.new/include/asm-mips/page.h 2007-09-13 15:13:00.000000000 +0800
75 #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
76 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
78 -#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
79 -#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
80 +#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \
82 +#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \
85 #include <asm-generic/memory_model.h>
86 #include <asm-generic/page.h>