From cc7072a69a802166ee53eda0808ba3141d684ddc Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Thu, 14 Aug 2008 22:47:18 -0400
Subject: [PATCH] --- yaml --- r: 116582 b: refs/heads/master c:
 28614889bcb2558a47d02d52394b7fd9795a9547 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/compiler.h | 2 ++
 trunk/include/linux/linkage.h  | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4cc3b8ac67e8..22313e74079a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9fdda33cd7c7519b082e37538fe790f9ff684bb
+refs/heads/master: 28614889bcb2558a47d02d52394b7fd9795a9547
diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h
index 8322141ee480..98115d9d04da 100644
--- a/trunk/include/linux/compiler.h
+++ b/trunk/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/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h
index 56ba37394656..9fd1f859021b 100644
--- a/trunk/include/linux/linkage.h
+++ b/trunk/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