From 98d3a7f876e5ad311c801ced5800716ec45a4db7 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 15 Jan 2013 18:51:32 +0100 Subject: [PATCH] --- yaml --- r: 349139 b: refs/heads/master c: 6f16f4998f98e42e3f2dedf663cfb691ff0324af h: refs/heads/master i: 349137: a1947d3f6c20a35b63ac38efbc8f5557f83455b5 349135: 9683aeff0d2264f1797642006634098d4c6cf293 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/head.S | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4789ebc27f6b..27a2b67a4e3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 568dca15aa2a0f4ddee255894ec393a159f13147 +refs/heads/master: 6f16f4998f98e42e3f2dedf663cfb691ff0324af diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S index 4eee351f4668..61fcb18c7e5b 100644 --- a/trunk/arch/arm/kernel/head.S +++ b/trunk/arch/arm/kernel/head.S @@ -246,6 +246,7 @@ __create_page_tables: /* * Then map boot params address in r2 if specified. + * We map 2 sections in case the ATAGs/DTB crosses a section boundary. */ mov r0, r2, lsr #SECTION_SHIFT movs r0, r0, lsl #SECTION_SHIFT @@ -253,6 +254,8 @@ __create_page_tables: addne r3, r3, #PAGE_OFFSET addne r3, r4, r3, lsr #(SECTION_SHIFT - PMD_ORDER) orrne r6, r7, r0 + strne r6, [r3], #1 << PMD_ORDER + addne r6, r6, #1 << SECTION_SHIFT strne r6, [r3] #ifdef CONFIG_DEBUG_LL