From a0d8ff1d0ecda29ff9c9973736c056d42e1019bc Mon Sep 17 00:00:00 2001
From: Linus Walleij <triad@df.lth.se>
Date: Sun, 21 Jan 2007 20:08:33 +0100
Subject: [PATCH] --- yaml --- r: 45927 b: refs/heads/master c:
 d4e1c889c1ec547371227558e1da5f2f50c7dd5e h: refs/heads/master i:   45925:
 a081e4743bf3d6e891d122b5c3c14bb603396577   45923:
 77e6b32ee8e593fcfce1d124f5ab33ec4b3168b4   45919:
 ada8b720835c06fb695d0b9608d10f5af6643370 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/arm/kernel/head.S | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f796329b2f8a..ad6186aece10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d28122a5877cc40350fa801353fd5a9350563ec3
+refs/heads/master: d4e1c889c1ec547371227558e1da5f2f50c7dd5e
diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S
index d994561816a1..cf495a3084b3 100644
--- a/trunk/arch/arm/kernel/head.S
+++ b/trunk/arch/arm/kernel/head.S
@@ -22,6 +22,10 @@
 #include <asm/thread_info.h>
 #include <asm/system.h>
 
+#if (PHYS_OFFSET & 0x001fffff)
+#error "PHYS_OFFSET must be at an even 2MiB boundary!"
+#endif
+
 #define KERNEL_RAM_VADDR	(PAGE_OFFSET + TEXT_OFFSET)
 #define KERNEL_RAM_PADDR	(PHYS_OFFSET + TEXT_OFFSET)
 
@@ -251,7 +255,8 @@ __create_page_tables:
 	 * Then map first 1MB of ram in case it contains our boot params.
 	 */
 	add	r0, r4, #PAGE_OFFSET >> 18
-	orr	r6, r7, #PHYS_OFFSET
+	orr	r6, r7, #(PHYS_OFFSET & 0xff000000)
+	orr	r6, r6, #(PHYS_OFFSET & 0x00e00000)
 	str	r6, [r0]
 
 #ifdef CONFIG_XIP_KERNEL