From 070ab6df378e2f6d2dc9d04551199fb422622ae5 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 12 May 2008 21:20:41 +0200
Subject: [PATCH] --- yaml --- r: 100415 b: refs/heads/master c:
 ffdc1a09ae7e2cbd714a446ee38a27f625b5f1c8 h: refs/heads/master i:   100413:
 5654ed48172c135ae67638e6213b9d0574f4a540   100411:
 985f908d7aba4ce4a749f218349559f2e260860c   100407:
 dde13c27156e0b10168f19fbd60cf762acddebd9   100399:
 7f8bf2feb2dc2d2ae69af5d51f6a5df964a7bcb7   100383:
 28cf38722093c8115fc2877f1551620c7f6798ac   100351:
 8a46db1dffaf095df2ccc5b3a9f89370139a46f2 v: v3

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

diff --git a/[refs] b/[refs]
index cd66ed156694..67358e934100 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 502825282e6f79c975a644afc124432ec1744de4
+refs/heads/master: ffdc1a09ae7e2cbd714a446ee38a27f625b5f1c8
diff --git a/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h
index 2119610b24f8..14f329c64ba8 100644
--- a/trunk/include/linux/linkage.h
+++ b/trunk/include/linux/linkage.h
@@ -3,6 +3,8 @@
 
 #include <asm/linkage.h>
 
+#define notrace __attribute__((no_instrument_function))
+
 #ifdef __cplusplus
 #define CPP_ASMLINKAGE extern "C"
 #else