From: Rob Herring <rob.herring@calxeda.com>
Date: Mon, 9 Jan 2012 21:43:20 +0000 (-0600)
Subject: ARM: make BSYM macro assembly only
X-Git-Tag: firefly_0821_release~3680^2~3670^2~1^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=efb963dcd9854c70667cdba9b5854b7290f1cefd;p=firefly-linux-kernel-4.4.55.git

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>
---

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 */