From 66c6a9b681ca0163dc49091165d87e5efee956a0 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 17 Apr 2008 17:40:51 +0200
Subject: [PATCH] --- yaml --- r: 88675 b: refs/heads/master c:
 78a9909aab54123c7c471022389b36972e13b48e h: refs/heads/master i:   88673:
 1cb0d182c77697b0ea96e452074fa60939e882f1   88671:
 ba1831589674d84bc807fc19fcbadab2c25d665c v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-x86/linkage.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4a1dc6ad58b7..e83c1169108e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11ae9dd48128790d3d2ece6bc916c001b4a1d147
+refs/heads/master: 78a9909aab54123c7c471022389b36972e13b48e
diff --git a/trunk/include/asm-x86/linkage.h b/trunk/include/asm-x86/linkage.h
index c048353f4b85..64e444f8e85b 100644
--- a/trunk/include/asm-x86/linkage.h
+++ b/trunk/include/asm-x86/linkage.h
@@ -1,6 +1,9 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
+#undef notrace
+#define notrace __attribute__((no_instrument_function))
+
 #ifdef CONFIG_X86_64
 #define __ALIGN .p2align 4,,15
 #define __ALIGN_STR ".p2align 4,,15"