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"