diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
| commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
| tree | c3f168427372e64f7467a794f313416da5086ba0 /include/linux/compiler-gcc.h | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 (diff) | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed (diff) | |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'include/linux/compiler-gcc.h')
| -rw-r--r-- | include/linux/compiler-gcc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 5c8351b859f0..af40f8eb86f0 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h | |||
| @@ -61,3 +61,8 @@ | |||
| 61 | #define noinline __attribute__((noinline)) | 61 | #define noinline __attribute__((noinline)) |
| 62 | #define __attribute_const__ __attribute__((__const__)) | 62 | #define __attribute_const__ __attribute__((__const__)) |
| 63 | #define __maybe_unused __attribute__((unused)) | 63 | #define __maybe_unused __attribute__((unused)) |
| 64 | |||
| 65 | #define __gcc_header(x) #x | ||
| 66 | #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) | ||
| 67 | #define gcc_header(x) _gcc_header(x) | ||
| 68 | #include gcc_header(__GNUC__) | ||