diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-06 22:33:19 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-06 22:33:19 +0000 |
| commit | b2a574ea27e17f3ea2f5bb09ab6a7f7f69b3dd03 (patch) | |
| tree | a1b566e6d019aee7fc2513404acf016544dd8bff /target/linux/ar7 | |
| parent | 875b899bb655c9cc012ccfb7e4c7f960be4e3078 (diff) | |
[ar7] fix cpmac panics with 2.6.32 (#6764)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20021 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7')
| -rw-r--r-- | target/linux/ar7/patches-2.6.32/100-board_support.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/target/linux/ar7/patches-2.6.32/100-board_support.patch b/target/linux/ar7/patches-2.6.32/100-board_support.patch index caa441eaf..0738354d8 100644 --- a/target/linux/ar7/patches-2.6.32/100-board_support.patch +++ b/target/linux/ar7/patches-2.6.32/100-board_support.patch @@ -26,3 +26,18 @@ } return (void *)old_handler; } +--- a/arch/mips/include/asm/page.h ++++ b/arch/mips/include/asm/page.h +@@ -185,8 +185,10 @@ typedef struct { unsigned long pgprot; } + #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + +-#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE) +-#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET) ++#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \ ++ PHYS_OFFSET) ++#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \ ++ PHYS_OFFSET) + + #include <asm-generic/memory_model.h> + #include <asm-generic/page.h> |