aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/head.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/head.S')
-rw-r--r--arch/arm/kernel/head.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 539626351348..dd5d0f07d358 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -21,6 +21,7 @@
21#include <asm/procinfo.h> 21#include <asm/procinfo.h>
22#include <asm/ptrace.h> 22#include <asm/ptrace.h>
23#include <asm/asm-offsets.h> 23#include <asm/asm-offsets.h>
24#include <asm/memory.h>
24#include <asm/thread_info.h> 25#include <asm/thread_info.h>
25#include <asm/system.h> 26#include <asm/system.h>
26 27
@@ -76,7 +77,7 @@
76 .equ swapper_pg_dir, DATAADDR - 0x4000 77 .equ swapper_pg_dir, DATAADDR - 0x4000
77 78
78 .macro pgtbl, rd, phys 79 .macro pgtbl, rd, phys
79 ldr \rd, =((DATAADDR - 0x4000) - VIRT_OFFSET) 80 ldr \rd, =((DATAADDR - 0x4000) - PAGE_OFFSET)
80 add \rd, \rd, \phys 81 add \rd, \rd, \phys
81 .endm 82 .endm
82#endif 83#endif
@@ -324,7 +325,7 @@ __create_page_tables:
324 /* 325 /*
325 * Then map first 1MB of ram in case it contains our boot params. 326 * Then map first 1MB of ram in case it contains our boot params.
326 */ 327 */
327 add r0, r4, #VIRT_OFFSET >> 18 328 add r0, r4, #PAGE_OFFSET >> 18
328 orr r6, r5, r7 329 orr r6, r5, r7
329 str r6, [r0] 330 str r6, [r0]
330 331