diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 09:51:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 09:51:24 +0100 |
| commit | 675eef66e3edcab8065533edfefbcbbacb9a30d3 (patch) | |
| tree | 49648661263d7c3b7645df904b3dbb18723ff744 /include/linux/compiler-gcc.h | |
| parent | 03f70388c39cef5dfdc70ce5473ec31577a18e6b (diff) | |
| parent | 96de37b62ca525cd77d2e85aea1472846ee31c4d (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
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 59e4028e833d..3fd17c249221 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -50,6 +50,11 @@ # define inline inline __attribute__((always_inline)) # define __inline__ __inline__ __attribute__((always_inline)) # define __inline __inline __attribute__((always_inline)) +#else +/* A lot of inline functions can cause havoc with function tracing */ +# define inline inline notrace +# define __inline__ __inline__ notrace +# define __inline __inline notrace #endif #define __deprecated __attribute__((deprecated)) |