From: Jon Medhurst <tixy@linaro.org>
Date: Wed, 29 Aug 2012 08:16:44 +0000 (+0100)
Subject: ARM: kernel: Fix compilation of sleep.S on ARMv6
X-Git-Tag: firefly_0821_release~3680^2~236^2^2~2^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59e1c2d0f95afdd94a05aeca24d70da87d8a500d;p=firefly-linux-kernel-4.4.55.git

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 c8952daf4104..b5c1e636ed85 100644
--- 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