summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2009-09-18 15:09:33 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2009-09-18 23:30:11 +0100
commit74109b8913277b1dbd072039d1e0a930d2834389 (patch)
tree3a0f83d7fb624a9a44a8e29f3938c68f135770fe /arch/arm/include/asm
parent200b812d0084f800bc52465e273b118ff5f8141f (diff)
downloadblackbird-op-linux-74109b8913277b1dbd072039d1e0a930d2834389.tar.gz
blackbird-op-linux-74109b8913277b1dbd072039d1e0a930d2834389.zip
Fix "W" macro in arch/arm/include/asm/unified.h
Please, fold into 0becb088501886f37ade38762c8eaaf4263572cc aka "Thumb-2: Add macros for the unified assembler syntax" otherwise: crypto/cast6.c:372:39: error: macro "W" passed 2 arguments, but takes just 1 Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/unified.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
index 073e85b9b961..bc631161e9c6 100644
--- a/arch/arm/include/asm/unified.h
+++ b/arch/arm/include/asm/unified.h
@@ -35,7 +35,9 @@
#define ARM(x...)
#define THUMB(x...) x
+#ifdef __ASSEMBLY__
#define W(instr) instr.w
+#endif
#define BSYM(sym) sym + 1
#else /* !CONFIG_THUMB2_KERNEL */
@@ -45,7 +47,9 @@
#define ARM(x...) x
#define THUMB(x...)
+#ifdef __ASSEMBLY__
#define W(instr) instr
+#endif
#define BSYM(sym) sym
#endif /* CONFIG_THUMB2_KERNEL */
OpenPOWER on IntegriCloud