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

various compilers

include/asm-arm/linkage.h

@@ -2,5 +2,6 @@
 #define __ASM_LINKAGE_H
 
 #define __ALIGN .align 0
+#define __ALIGN_STR ".align 0"
 
 #endif

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

include/asm-m68k/linkage.h

@@ -2,5 +2,6 @@
 #define __ASM_LINKAGE_H
 
 #define __ALIGN .align 4
+#define __ALIGN_STR ".align 4"
 
 #endif

include/asm-sh/linkage.h

@@ -2,5 +2,6 @@
 #define __ASM_LINKAGE_H
 
 #define __ALIGN .balign 4
+#define __ALIGN_STR ".balign 4"
 
 #endif

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

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