diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-03-06 22:33:19 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-03-06 22:33:19 +0000 |
| commit | ffd352b2bad63eb77de0540ce68c2b63ba8620db (patch) | |
| tree | 051da99e0bfc824ab608cd1d1045b92114a4827f | |
| parent | c3ef00eb2bce7c733ea536db6279491faafae088 (diff) | |
| download | upstream-ffd352b2bad63eb77de0540ce68c2b63ba8620db.tar.gz upstream-ffd352b2bad63eb77de0540ce68c2b63ba8620db.tar.bz2 upstream-ffd352b2bad63eb77de0540ce68c2b63ba8620db.zip | |
fix cpmac panics with 2.6.32 (#6764)
SVN-Revision: 20021
| -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 caa441eafc..0738354d89 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> |