diff --git a/[refs] b/[refs]
index 8d4631865622..a52eedb8c109 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30fb6aa74011dcf595f306ca2727254d708b786e
+refs/heads/master: 45959ee7aa645815a5ce303a0ea1e48a21e67c6a
diff --git a/trunk/include/linux/compiler-gcc.h b/trunk/include/linux/compiler-gcc.h
index 59e4028e833d..3fd17c249221 100644
--- a/trunk/include/linux/compiler-gcc.h
+++ b/trunk/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))