From c6a6091733146d93cf38527f162e48198d9c1509 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 12 Dec 2011 15:22:41 -0500 Subject: [PATCH] --- yaml --- r: 285057 b: refs/heads/master c: 45959ee7aa645815a5ce303a0ea1e48a21e67c6a h: refs/heads/master i: 285055: cb71898bd4cfb80c7b6a6bf5cd0a0c62c07748c5 v: v3 --- [refs] | 2 +- trunk/include/linux/compiler-gcc.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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))