[ar7] fix cpmac panics with 2.6.32 (#6764)
authorFlorian Fainelli <florian@openwrt.org>
Sat, 6 Mar 2010 22:33:19 +0000 (22:33 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sat, 6 Mar 2010 22:33:19 +0000 (22:33 +0000)
SVN-Revision: 20021

target/linux/ar7/patches-2.6.32/100-board_support.patch

index caa441e..0738354 100644 (file)
        }
        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>