Patchwork [11/18] ARM: make BSYM macro assembly only

login
register
mail settings
Submitter Ike Panhc
Date May 17, 2012, 6:45 a.m.
Message ID <1337237148-3674-1-git-send-email-ike.pan@canonical.com>
Download mbox | patch
Permalink /patch/159831/
State New
Headers show

Comments

Ike Panhc - May 17, 2012, 6:45 a.m.
From: Rob Herring <rob.herring@calxeda.com>

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>
(cherry picked from commit efb963dcd9854c70667cdba9b5854b7290f1cefd)

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
 arch/arm/include/asm/unified.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
index bc63116..f5989f4 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 */