summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-08-14 22:47:18 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-14 10:35:08 +0200
commit28614889bcb2558a47d02d52394b7fd9795a9547 (patch)
tree1b9e3b91c6db5927a6e53f5f1175aa25b27c4a9f
parenta9fdda33cd7c7519b082e37538fe790f9ff684bb (diff)
downloadblackbird-op-linux-28614889bcb2558a47d02d52394b7fd9795a9547.tar.gz
blackbird-op-linux-28614889bcb2558a47d02d52394b7fd9795a9547.zip
ftrace: move notrace to compiler.h
The notrace define belongs in compiler.h so that it can be used in init.h Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/compiler.h2
-rw-r--r--include/linux/linkage.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 8322141ee480..98115d9d04da 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -44,6 +44,8 @@ extern void __chk_io_ptr(const volatile void __iomem *);
# error Sorry, your compiler is too old/not recognized.
#endif
+#define notrace __attribute__((no_instrument_function))
+
/* Intel compiler defines __GNUC__. So we will overwrite implementations
* coming from above header files here
*/
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 56ba37394656..9fd1f859021b 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -4,8 +4,6 @@
#include <linux/compiler.h>
#include <asm/linkage.h>
-#define notrace __attribute__((no_instrument_function))
-
#ifdef __cplusplus
#define CPP_ASMLINKAGE extern "C"
#else
OpenPOWER on IntegriCloud