diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-06-15 15:03:50 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-06-15 15:03:50 -0400 |
| commit | 22120d2bdfe905fff7e5ad86de4c6d6018e52751 (patch) | |
| tree | cc72c89cb2c24772749f4e98038d4374803ec55e /arch/arm/kernel/head.S | |
| parent | da9783558c467d9f0688230f5e77d2921cd41007 (diff) | |
| parent | 4c6dfbfe2926eca135851dc5c403bf3ab84c533b (diff) | |
Merge remote branch 'catalin/rebased'linaro_merge_100616
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/kernel/head.S')
| -rw-r--r-- | arch/arm/kernel/head.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index eb62bf94721..82ea9245b82 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -302,6 +302,8 @@ __create_page_tables: movhi r3, #0x0800 add r6, r0, r3 ldr r3, [r8, #MACHINFO_PHYSIO] + mov r3, r3, lsr #20 @ 1MB-aligned address + mov r3, r3, lsl #20 orr r3, r3, r7 1: str r3, [r0], #4 add r3, r3, #1 << 20 |