aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/head-common.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-04 11:22:34 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-08 05:07:32 -0400
commita4ae41341fd39af6e25ec9861a6a4dc0c5c58b16 (patch)
tree1f36e414f8b3d29ddbe6d0407b0c141cb8d8b74d /arch/arm/kernel/head-common.S
parent5085f3ff458521045f7e43da62b8c30ea7df2e82 (diff)
ARM: cleanup boot cpu calling __mmap_switched
This allows us to relocate __mmap_switched and associated data away from the head section. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/head-common.S')
-rw-r--r--arch/arm/kernel/head-common.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 6ad24d2cb14b..9f473ef2a64c 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -18,7 +18,6 @@
18 .align 2 18 .align 2
19 .type __switch_data, %object 19 .type __switch_data, %object
20__switch_data: 20__switch_data:
21 .long __mmap_switched
22 .long __data_loc @ r4 21 .long __data_loc @ r4
23 .long _data @ r5 22 .long _data @ r5
24 .long __bss_start @ r6 23 .long __bss_start @ r6
@@ -39,7 +38,7 @@ __switch_data:
39 * r9 = processor ID 38 * r9 = processor ID
40 */ 39 */
41__mmap_switched: 40__mmap_switched:
42 adr r3, __switch_data + 4 41 adr r3, __switch_data
43 42
44 ldmia r3!, {r4, r5, r6, r7} 43 ldmia r3!, {r4, r5, r6, r7}
45 cmp r4, r5 @ Copy data segment if needed 44 cmp r4, r5 @ Copy data segment if needed