ARM: kernel: Fix compilation of sleep.S on ARMv6

The patch "ARM: kernel: fix MPIDR cpu_{suspend}/{resume} usage"
uses the BFC assembler instruction but this isn't available
on ARMv6 CPUs, which breaks compilation when building kernels which
support both SMP and ARMv6, e.g. omap2plus_defconifg.

Fix this by using a BIC instruction instead.

Signed-off-by: Jon Medhurst <tixy@linaro.org>

diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index c8952daf4104c146b35f190b8e265c23843eecb4..b5c1e636ed8559f22411aa7412d09db526633a18 100644 (file)
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -85,7 +85,7 @@ ENTRY(cpu_resume)
        mov     r1, #0                  @ fall-back logical index for UP
        ALT_SMP(mrc p15, 0, r0, c0, c0, 5)
        ALT_UP_B(1f)
-       bfc     r0, #24, #8
+       bic     r0, #0xff000000
        bl      cpu_logical_index       @ return logical index in r1
 1:
        adr     r0, sleep_save_sp