---

yaml --- r: 156488 b: refs/heads/master c: 8666f8d h: refs/heads/master v: v3
git-mirror · Jul 28, 2009 · 0dc2a92 · 0dc2a92
1 parent e416c54
commit 0dc2a92
Show file tree

Hide file tree

Showing 24 changed files with 209 additions and 123 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dbc80f69e131ecca42a5958b7785a57851c80d7
+refs/heads/master: 8666f8deec75a8dce15edd35ec33d29ef79cdb08
diff --git a/trunk/Documentation/arm/memory.txt b/trunk/Documentation/arm/memory.txt
@@ -21,8 +21,6 @@ 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,6 +29,7 @@ unsigned int __machine_arch_type;
 
 static void putstr(const char *ptr);
 
+#include <linux/compiler.h>
 #include <mach/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC