fix cpmac panics with 2.6.32 (#6764)

SVN-Revision: 20021
This commit is contained in:
Florian Fainelli 2010-03-06 22:33:19 +00:00
parent c3ef00eb2b
commit ffd352b2ba

View file

@ -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>