diff options
| author | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /include/linux/compiler.h | |
| parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 8322141ee480..98115d9d04da 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h | |||
| @@ -44,6 +44,8 @@ extern void __chk_io_ptr(const volatile void __iomem *); | |||
| 44 | # error Sorry, your compiler is too old/not recognized. | 44 | # error Sorry, your compiler is too old/not recognized. |
| 45 | #endif | 45 | #endif |
| 46 | 46 | ||
| 47 | #define notrace __attribute__((no_instrument_function)) | ||
| 48 | |||
| 47 | /* Intel compiler defines __GNUC__. So we will overwrite implementations | 49 | /* Intel compiler defines __GNUC__. So we will overwrite implementations |
| 48 | * coming from above header files here | 50 | * coming from above header files here |
| 49 | */ | 51 | */ |