From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 3 Jun 2013 13:15:36 +0000 (+0200)
Subject: drivers/bus: arm-cci: fix combined ARMv6+v7 build
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~71^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49024926236068bc3fe6848aaf87b914049013a;p=pandora-kernel.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 <arnd@arndb.de>
Acked-by: Nicolas Pitre <nico@linaro.org>
Cc: Dave Martin <dave.martin@linaro.org>
---

Reading git-diff-tree failed