From: Arnd Bergmann Date: Mon, 3 Jun 2013 13:15:36 +0000 (+0200) Subject: drivers/bus: arm-cci: fix combined ARMv6+v7 build X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f49024926236068bc3fe6848aaf87b914049013a;p=linux-beck.git drivers/bus: arm-cci: fix combined ARMv6+v7 build When we build a kernel with support for both ARMv6 and ARMv7, gas is trying to be helpful by pointing out that the arm-cci driver would not work on ARMv6: /tmp/ccu1LDeU.s: Assembler messages: /tmp/ccu1LDeU.s:450: Error: selected processor does not support ARM mode `wfi ' /tmp/ccu1LDeU.s:451: Error: selected processor does not support ARM mode `wfe ' make[4]: *** [drivers/bus/arm-cci.o] Error 1 We know that the driver will only be used on ARMv7, hence we can annotate the inline assembly listing to allow those instructions. Signed-off-by: Arnd Bergmann Acked-by: Nicolas Pitre Cc: Dave Martin --- diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 380319ebf729..733288967d4d 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -253,7 +253,7 @@ EXPORT_SYMBOL_GPL(cci_disable_port_by_cpu); asmlinkage void __naked cci_enable_port_for_self(void) { asm volatile ("\n" - +" .arch armv7-a\n" " mrc p15, 0, r0, c0, c0, 5 @ get MPIDR value \n" " and r0, r0, #"__stringify(MPIDR_HWID_BITMASK)" \n" " adr r1, 5f \n"