diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:26:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:26:58 +0200 |
| commit | 6921a575c9f26f7ea274aaea3b78967810ce5513 (patch) | |
| tree | be9ad9533541cb87a8d7dd091ad8ada20a75dc4c | |
| parent | perf: Use css_tryget() to avoid propping up css refcount (diff) | |
| parent | ftrace: Make all inline tags also include notrace (diff) | |
| download | linux-6921a575c9f26f7ea274aaea3b78967810ce5513.tar.xz linux-6921a575c9f26f7ea274aaea3b78967810ce5513.zip | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
| -rw-r--r-- | include/linux/compiler-gcc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index e5834aa24b9e..6a6d7aefe12d 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -47,9 +47,9 @@ */ #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) -# define inline inline __attribute__((always_inline)) -# define __inline__ __inline__ __attribute__((always_inline)) -# define __inline __inline __attribute__((always_inline)) +# define inline inline __attribute__((always_inline)) notrace +# define __inline__ __inline__ __attribute__((always_inline)) notrace +# define __inline __inline __attribute__((always_inline)) notrace #else /* A lot of inline functions can cause havoc with function tracing */ # define inline inline notrace |