summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-01-09 22:43:20 +0100
committerRob Herring <rob.herring@calxeda.com>2012-01-16 15:56:25 +0100
commitefb963dcd9854c70667cdba9b5854b7290f1cefd (patch)
treee9d0c6313755e3a28ca82e9528d72d90d791f16e /arch
parentARM: highbank: remove incorrect BSYM usage (diff)
downloadlinux-efb963dcd9854c70667cdba9b5854b7290f1cefd.tar.xz
linux-efb963dcd9854c70667cdba9b5854b7290f1cefd.zip
ARM: make BSYM macro assembly only
BSYM macro is only needed for assembly files and its usage in c files is wrong, so only define it for assembly. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Dave Martin <dave.martin@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/unified.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
index bc631161e9c6..f5989f46b4d2 100644
--- a/arch/arm/include/asm/unified.h
+++ b/arch/arm/include/asm/unified.h
@@ -37,8 +37,8 @@
#define THUMB(x...) x
#ifdef __ASSEMBLY__
#define W(instr) instr.w
-#endif
#define BSYM(sym) sym + 1
+#endif
#else /* !CONFIG_THUMB2_KERNEL */
@@ -49,8 +49,8 @@
#define THUMB(x...)
#ifdef __ASSEMBLY__
#define W(instr) instr
-#endif
#define BSYM(sym) sym
+#endif
#endif /* CONFIG_THUMB2_KERNEL */