diff options
| author | Russell King | 2014-04-13 20:43:26 +0200 |
|---|---|---|
| committer | Russell King | 2014-06-02 10:20:18 +0200 |
| commit | 0aeb3408ca9773283b0ae63771c4b17f39e204df (patch) | |
| tree | cfd151a26e9c3b2a4859f983f2db8a345630e269 /arch/arm/kernel | |
| parent | ARM: remove CPU_CP15 conditional from alignment.c (diff) | |
| download | kernel-qcow2-linux-0aeb3408ca9773283b0ae63771c4b17f39e204df.tar.gz kernel-qcow2-linux-0aeb3408ca9773283b0ae63771c4b17f39e204df.tar.xz kernel-qcow2-linux-0aeb3408ca9773283b0ae63771c4b17f39e204df.zip | |
ARM: remove global cr_no_alignment
cr_no_alignment is really only used by the alignment code. Since we no
longer change the setting of cr_alignment after boot, we can localise
this to alignment.c
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 3 | ||||
| -rw-r--r-- | arch/arm/kernel/head-common.S | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 1879e8dd2acc..cac5b88216e6 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1143,11 +1143,8 @@ __vectors_start: .data .globl cr_alignment - .globl cr_no_alignment cr_alignment: .space 4 -cr_no_alignment: - .space 4 #ifdef CONFIG_MULTI_IRQ_HANDLER .globl handle_arch_irq diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index c96ecacb2021..572a38335c96 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S @@ -99,8 +99,7 @@ __mmap_switched: str r1, [r5] @ Save machine type str r2, [r6] @ Save atags pointer cmp r7, #0 - bicne r4, r0, #CR_A @ Clear 'A' bit - stmneia r7, {r0, r4} @ Save control register values + strne r0, [r7] @ Save control register values b start_kernel ENDPROC(__mmap_switched) |