diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-03 08:44:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-03 08:44:56 -0700 |
| commit | 35aa61ec011d8712717362550cd0008bcc7d99e8 (patch) | |
| tree | 63a86d8e4b3f10427c45b14e54e3b3ccad5c0532 | |
| parent | bd8feaa6384f5b94a0dbd67c17eab832b9ea52bf (diff) | |
Undo "stringify()" changes, since they don't work with
various compilers
| -rw-r--r-- | include/asm-arm/linkage.h | 1 | ||||
| -rw-r--r-- | include/asm-i386/linkage.h | 1 | ||||
| -rw-r--r-- | include/asm-m68k/linkage.h | 1 | ||||
| -rw-r--r-- | include/asm-sh/linkage.h | 1 | ||||
| -rw-r--r-- | include/linux/linkage.h | 6 | ||||
| -rw-r--r-- | include/linux/stringify.h | 4 |
6 files changed, 8 insertions, 6 deletions
diff --git a/include/asm-arm/linkage.h b/include/asm-arm/linkage.h index 6c63642c3fac..dbe4b4e31a5b 100644 --- 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 3df5476b3425..9bca2cdf3c72 100644 --- 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 cd0762743c60..5a822bb790f7 100644 --- 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 105773f3e0d2..3565a4f4009f 100644 --- 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 4b8c0e9b3a48..f85642639950 100644 --- 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 d241152aaff4..8a8323750228 100644 --- 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 */ |