Merge branch 'x86/core' into x86/apic

[karo-tx-linux.git] / include / asm-x86 / linkage.h

diff --git a/include/asm-x86/linkage.h b/include/asm-x86/linkage.h
index c048353f4b8558f73b8939980c8de947a5fd0513..42d8b62ee8abe72e842c55a3c337d0e947802561 100644 (file)
--- a/include/asm-x86/linkage.h
+++ b/include/asm-x86/linkage.h
@@ -1,5 +1,8 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
+#ifndef ASM_X86__LINKAGE_H
+#define ASM_X86__LINKAGE_H
+
+#undef notrace
+#define notrace __attribute__((no_instrument_function))
 
 #ifdef CONFIG_X86_64
 #define __ALIGN .p2align 4,,15
@@ -54,5 +57,5 @@
 #define __ALIGN_STR ".align 16,0x90"
 #endif
 
-#endif
+#endif /* ASM_X86__LINKAGE_H */