Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linu…

…x/kernel/git/rostedt/linux-trace into perf/urgent
mariux64 · Jun 20, 2012 · 6921a57 · 6921a57
2 parents 9c5da09 + 93b3cca
commit 6921a57
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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