diff options
Diffstat (limited to 'include/linux/compiler-gcc4.h')
-rw-r--r-- | include/linux/compiler-gcc4.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 974f5b7bb20..aa426214331 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
@@ -2,9 +2,6 @@ | |||
2 | #error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead." | 2 | #error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead." |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | /* These definitions are for GCC v4.x. */ | ||
6 | #include <linux/compiler-gcc.h> | ||
7 | |||
8 | #define __used __attribute__((__used__)) | 5 | #define __used __attribute__((__used__)) |
9 | #define __must_check __attribute__((warn_unused_result)) | 6 | #define __must_check __attribute__((warn_unused_result)) |
10 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) | 7 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) |
@@ -16,7 +13,7 @@ | |||
16 | */ | 13 | */ |
17 | #define uninitialized_var(x) x = x | 14 | #define uninitialized_var(x) x = x |
18 | 15 | ||
19 | #if !(__GNUC__ == 4 && __GNUC_MINOR__ < 3) | 16 | #if __GNUC_MINOR__ >= 3 |
20 | /* Mark functions as cold. gcc will assume any path leading to a call | 17 | /* Mark functions as cold. gcc will assume any path leading to a call |
21 | to them will be unlikely. This means a lot of manual unlikely()s | 18 | to them will be unlikely. This means a lot of manual unlikely()s |
22 | are unnecessary now for any paths leading to the usual suspects | 19 | are unnecessary now for any paths leading to the usual suspects |