---

yaml --- r: 156499 b: refs/heads/master c: 38a6fe8 h: refs/heads/master i: 156497: cb91c4c 156495: 8835c32 v: v3
git-mirror · Aug 3, 2009 · da180c3 · da180c3
1 parent 296f117
commit da180c3
Show file tree

Hide file tree

Showing 26 changed files with 328 additions and 158 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909db80297ba65699a77d877f7bf618ba960f6fc
+refs/heads/master: 38a6fe8c013e72c402b37a7ea400387120f460d8
diff --git a/trunk/Documentation/arm/memory.txt b/trunk/Documentation/arm/memory.txt
@@ -21,6 +21,8 @@ ffff8000	ffffffff	copy_user_page / clear_user_page use.
 				For SA11xx and Xscale, this is used to
 				setup a minicache mapping.
 
+ffff4000	ffffffff	cache aliasing on ARMv6 and later CPUs.
+
 ffff1000	ffff7fff	Reserved.
 				Platforms must not use this address range.
 

diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c
@@ -29,7 +29,6 @@ unsigned int __machine_arch_type;
 
 static void putstr(const char *ptr);
 
-#include <linux/compiler.h>
 #include <mach/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC