Remove the deprecated cli() sti() functions

[linux-2.6] / include / asm-x86 / linkage.h

diff --git a/include/asm-x86/linkage.h b/include/asm-x86/linkage.h
index c048353f4b8558f73b8939980c8de947a5fd0513..64e444f8e85b2d9fccaf50cc78ceaa1da0654877 100644 (file)
--- a/include/asm-x86/linkage.h
+++ b/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"