aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Konev <ejka@imfi.kspu.ru>2007-09-13 07:16:26 +0000
committerEugene Konev <ejka@imfi.kspu.ru>2007-09-13 07:16:26 +0000
commita5472471a08a030c2c0ceeb3368f1cde48ac7a8b (patch)
treee52560b628d38a39f36a594c2ab81e6769b0d393
parent2f0762749dc1c9945aa3a3cb624d0fc235d289c7 (diff)
downloadupstream-a5472471a08a030c2c0ceeb3368f1cde48ac7a8b.tar.gz
upstream-a5472471a08a030c2c0ceeb3368f1cde48ac7a8b.tar.bz2
upstream-a5472471a08a030c2c0ceeb3368f1cde48ac7a8b.zip
fix CAC_ADDR/UNCAC_ADDR macros
SVN-Revision: 8770
-rw-r--r--target/linux/ar7/patches-2.6.22/100-board_support.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/ar7/patches-2.6.22/100-board_support.patch b/target/linux/ar7/patches-2.6.22/100-board_support.patch
index ba070df294..0297ef651f 100644
--- a/target/linux/ar7/patches-2.6.22/100-board_support.patch
+++ b/target/linux/ar7/patches-2.6.22/100-board_support.patch
@@ -68,3 +68,19 @@ diff -urN linux-2.6.22/arch/mips/Makefile linux-2.6.22.new/arch/mips/Makefile
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
#
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
+diff -urN linux-2.6.22.4/include/asm-mips/page.h linux-2.6.22.4.new/include/asm-mips/page.h
+--- linux-2.6.22.4/include/asm-mips/page.h 2007-08-21 12:33:06.000000000 +0800
++++ linux-2.6.22.4.new/include/asm-mips/page.h 2007-09-13 15:13:00.000000000 +0800
+@@ -187,8 +187,10 @@
+ #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>