From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 6 Mar 2010 22:33:19 +0000 (+0000)
Subject: [ar7] fix cpmac panics with 2.6.32 (#6764)
X-Git-Tag: fast2504n-3.10.28-merged~12959
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b2a574ea27e17f3ea2f5bb09ab6a7f7f69b3dd03;p=openwrt.git

[ar7] fix cpmac panics with 2.6.32 (#6764)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20021 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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>