summaryrefslogtreecommitdiffstats
path: root/arch/m32r
diff options
context:
space:
mode:
authorHirokazu Takata <takata@linux-m32r.org>2009-05-02 22:08:33 +0900
committerHirokazu Takata <takata@linux-m32r.org>2009-05-02 22:38:21 +0900
commit9cd67243de582c206758adff152c5fcc1b2aa069 (patch)
tree396421578f8ddefb31770dc27277f36a2be611a9 /arch/m32r
parent9c88b06dc7589fb0bccd617c4659066fb803cfda (diff)
downloadlinux-9cd67243de582c206758adff152c5fcc1b2aa069.tar.gz
linux-9cd67243de582c206758adff152c5fcc1b2aa069.tar.bz2
linux-9cd67243de582c206758adff152c5fcc1b2aa069.zip
m32r: use __stringify() macro in assembler.h
Replace #x with __stringify(x). Also, #ifndef __STR is removed and undefine __STR macro at the beginning. The __STR() macro is still remained, because the assembler.h might be included from assembly codes as well as C codes. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Diffstat (limited to 'arch/m32r')
-rw-r--r--arch/m32r/include/asm/assembler.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/m32r/include/asm/assembler.h b/arch/m32r/include/asm/assembler.h
index 26351539b5ff..728799fc70aa 100644
--- a/arch/m32r/include/asm/assembler.h
+++ b/arch/m32r/include/asm/assembler.h
@@ -9,14 +9,15 @@
* This file contains M32R architecture specific macro definitions.
*/
+#include <linux/stringify.h>
+
+#undef __STR
-#ifndef __STR
#ifdef __ASSEMBLY__
#define __STR(x) x
#else
-#define __STR(x) #x
+#define __STR(x) __stringify(x)
#endif
-#endif /* __STR */
#ifdef CONFIG_SMP
#define M32R_LOCK __STR(lock)