diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-03 15:15:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-03 15:26:08 +0200 |
| commit | f49024926236068bc3fe6848aaf87b914049013a (patch) | |
| tree | 4c758673c202cfc5313f37d2f8d00f8d558bb259 /drivers/bus | |
| parent | Merge branch 'VExpress_DCSCB' of git://git.linaro.org/people/nico/linux into ... (diff) | |
| download | linux-f49024926236068bc3fe6848aaf87b914049013a.tar.xz linux-f49024926236068bc3fe6848aaf87b914049013a.zip | |
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 <arnd@arndb.de>
Acked-by: Nicolas Pitre <nico@linaro.org>
Cc: Dave Martin <dave.martin@linaro.org>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/arm-cci.c | 2 |
1 files changed, 1 insertions, 1 deletions
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" |