Undo "stringify()" changes, since they don't work with

various compilers

diff --git a/include/asm-arm/linkage.h b/include/asm-arm/linkage.h
index 6c63642c3fac5dd31343d45815e4a57207392710..dbe4b4e31a5b5d39026d955ff34463227fffe3ef 100644 (file)
--- a/include/asm-arm/linkage.h
+++ b/include/asm-arm/linkage.h
@@ -2,5 +2,6 @@
 #define __ASM_LINKAGE_H
 
 #define __ALIGN .align 0
+#define __ALIGN_STR ".align 0"
 
 #endif

diff --git a/include/asm-i386/linkage.h b/include/asm-i386/linkage.h
index 3df5476b342549a53b2383b9817a4c9f2a4636fe..9bca2cdf3c72360a96daa0eff513680305da2dc6 100644 (file)
--- a/include/asm-i386/linkage.h
+++ b/include/asm-i386/linkage.h
@@ -6,6 +6,7 @@
 
 #ifdef CONFIG_X86_ALIGNMENT_16
 #define __ALIGN .align 16,0x90
+#define __ALIGN_STR ".align 16,0x90"
 #endif
 
 #endif

diff --git a/include/asm-m68k/linkage.h b/include/asm-m68k/linkage.h
index cd0762743c60e939595d67dc866e4640ba7e6bdc..5a822bb790f72135862dcc0b7a97296954d73bd9 100644 (file)
--- a/include/asm-m68k/linkage.h
+++ b/include/asm-m68k/linkage.h
@@ -2,5 +2,6 @@
 #define __ASM_LINKAGE_H
 
 #define __ALIGN .align 4
+#define __ALIGN_STR ".align 4"
 
 #endif

diff --git a/include/asm-sh/linkage.h b/include/asm-sh/linkage.h
index 105773f3e0d2e79510821e1cbf68e318a2c7345f..3565a4f4009f7f6ba84bff2f6ce25aa46d284588 100644 (file)
--- a/include/asm-sh/linkage.h
+++ b/include/asm-sh/linkage.h
@@ -2,5 +2,6 @@
 #define __ASM_LINKAGE_H
 
 #define __ALIGN .balign 4
+#define __ALIGN_STR ".balign 4"
 
 #endif

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 4b8c0e9b3a48ec4ad0952dce1a6fe688e4dc10cd..f856426399506e924f36e9d73b35e334d5ef0a79 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -2,7 +2,6 @@
 #define _LINUX_LINKAGE_H
 
 #include <linux/config.h>
-#include <linux/stringify.h>
 #include <asm/linkage.h>
 
 #ifdef __cplusplus
@@ -16,11 +15,10 @@
 #endif
 
 #ifndef __ALIGN
-#define __ALIGN .align 4,0x90
+#define __ALIGN                .align 4,0x90
+#define __ALIGN_STR    ".align 4,0x90"
 #endif
 
-#define __ALIGN_STR __stringify(__ALIGN)
-
 #ifdef __ASSEMBLY__
 
 #define ALIGN __ALIGN

diff --git a/include/linux/stringify.h b/include/linux/stringify.h
index d241152aaff401e202d79969e69be98b3f6d808f..8a8323750228469152d2d864202cb72aba9731c6 100644 (file)
--- a/include/linux/stringify.h
+++ b/include/linux/stringify.h
@@ -10,7 +10,7 @@
  * like two arguments, which breaks the standard non-vararg stringizer.
  */
 
-#define __stringify_1(...)     #__VA_ARGS__
-#define __stringify(...)       __stringify_1(__VA_ARGS__)
+#define __stringify_1(x)       #x
+#define __stringify(x)         __stringify_1(x)
 
 #endif /* !__LINUX_STRINGIFY_H */