Commit 35aa61ec authored by Linus Torvalds's avatar Linus Torvalds

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

various compilers
parent bd8feaa6
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
#define __ASM_LINKAGE_H #define __ASM_LINKAGE_H
#define __ALIGN .align 0 #define __ALIGN .align 0
#define __ALIGN_STR ".align 0"
#endif #endif
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#ifdef CONFIG_X86_ALIGNMENT_16 #ifdef CONFIG_X86_ALIGNMENT_16
#define __ALIGN .align 16,0x90 #define __ALIGN .align 16,0x90
#define __ALIGN_STR ".align 16,0x90"
#endif #endif
#endif #endif
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
#define __ASM_LINKAGE_H #define __ASM_LINKAGE_H
#define __ALIGN .align 4 #define __ALIGN .align 4
#define __ALIGN_STR ".align 4"
#endif #endif
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
#define __ASM_LINKAGE_H #define __ASM_LINKAGE_H
#define __ALIGN .balign 4 #define __ALIGN .balign 4
#define __ALIGN_STR ".balign 4"
#endif #endif
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define _LINUX_LINKAGE_H #define _LINUX_LINKAGE_H
#include <linux/config.h> #include <linux/config.h>
#include <linux/stringify.h>
#include <asm/linkage.h> #include <asm/linkage.h>
#ifdef __cplusplus #ifdef __cplusplus
...@@ -17,10 +16,9 @@ ...@@ -17,10 +16,9 @@
#ifndef __ALIGN #ifndef __ALIGN
#define __ALIGN .align 4,0x90 #define __ALIGN .align 4,0x90
#define __ALIGN_STR ".align 4,0x90"
#endif #endif
#define __ALIGN_STR __stringify(__ALIGN)
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
#define ALIGN __ALIGN #define ALIGN __ALIGN
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* like two arguments, which breaks the standard non-vararg stringizer. * like two arguments, which breaks the standard non-vararg stringizer.
*/ */
#define __stringify_1(...) #__VA_ARGS__ #define __stringify_1(x) #x
#define __stringify(...) __stringify_1(__VA_ARGS__) #define __stringify(x) __stringify_1(x)
#endif /* !__LINUX_STRINGIFY_H */ #endif /* !__LINUX_STRINGIFY_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment