Merge branch 'tracking-armlt-tc2-cpufreq' into lsk-3.10-vexpress

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

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