diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-12 05:32:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-12 05:32:03 -0500 |
| commit | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (patch) | |
| tree | 652a84674ed05eaa46a813de2223af0bd0168a5a /include/linux/compiler.h | |
| parent | 5762ba1873b0bb9faa631aaa02f533c2b9837f82 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into timers/hrtimers
Conflicts:
kernel/time/tick-common.c
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index ea7c6be354b7..d95da1020f1c 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h | |||
| @@ -36,12 +36,8 @@ extern void __chk_io_ptr(const volatile void __iomem *); | |||
| 36 | 36 | ||
| 37 | #ifdef __KERNEL__ | 37 | #ifdef __KERNEL__ |
| 38 | 38 | ||
| 39 | #if __GNUC__ >= 4 | 39 | #ifdef __GNUC__ |
| 40 | # include <linux/compiler-gcc4.h> | 40 | #include <linux/compiler-gcc.h> |
| 41 | #elif __GNUC__ == 3 && __GNUC_MINOR__ >= 2 | ||
| 42 | # include <linux/compiler-gcc3.h> | ||
| 43 | #else | ||
| 44 | # error Sorry, your compiler is too old/not recognized. | ||
| 45 | #endif | 41 | #endif |
| 46 | 42 | ||
| 47 | #define notrace __attribute__((no_instrument_function)) | 43 | #define notrace __attribute__((no_instrument_function)) |