Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / head-common.S

diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index c96ecacb2021222936844a4807f39ef474965879..572a38335c9627a81307c4a88f7ab0981332af0f 100644 (file)
--- 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)