x86: linkage - get rid of _X86 macros

Impact: cleanup

There was an attempt to bring build-time checking for
missed ENTRY_X86/END_X86 and KPROBE... pairs. Using
them will add messy in code. Get just rid of them.
This commit could be easily restored if the need appear
in future.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index 2ecf0f6fc9e6b3d561db2250714d5213236c6340..9320e2a8a26a46e99aa2c5eae5a6bd381cc90610 100644 (file)
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -61,65 +61,5 @@
 #define __ALIGN_STR ".align 16,0x90"
 #endif
 
-/*
- * to check ENTRY_X86/END_X86 and
- * KPROBE_ENTRY_X86/KPROBE_END_X86
- * unbalanced-missed-mixed appearance
- */
-#define __set_entry_x86                .set ENTRY_X86_IN, 0
-#define __unset_entry_x86      .set ENTRY_X86_IN, 1
-#define __set_kprobe_x86       .set KPROBE_X86_IN, 0
-#define __unset_kprobe_x86     .set KPROBE_X86_IN, 1
-
-#define __macro_err_x86 .error "ENTRY_X86/KPROBE_X86 unbalanced,missed,mixed"
-
-#define __check_entry_x86      \
-       .ifdef ENTRY_X86_IN;    \
-       .ifeq ENTRY_X86_IN;     \
-       __macro_err_x86;        \
-       .abort;                 \
-       .endif;                 \
-       .endif
-
-#define __check_kprobe_x86     \
-       .ifdef KPROBE_X86_IN;   \
-       .ifeq KPROBE_X86_IN;    \
-       __macro_err_x86;        \
-       .abort;                 \
-       .endif;                 \
-       .endif
-
-#define __check_entry_kprobe_x86       \
-       __check_entry_x86;              \
-       __check_kprobe_x86
-
-#define ENTRY_KPROBE_FINAL_X86 __check_entry_kprobe_x86
-
-#define ENTRY_X86(name)                        \
-       __check_entry_kprobe_x86;       \
-       __set_entry_x86;                \
-       .globl name;                    \
-       __ALIGN;                        \
-       name:
-
-#define END_X86(name)                  \
-       __unset_entry_x86;              \
-       __check_entry_kprobe_x86;       \
-       .size name, .-name
-
-#define KPROBE_ENTRY_X86(name)         \
-       __check_entry_kprobe_x86;       \
-       __set_kprobe_x86;               \
-       .pushsection .kprobes.text, "ax"; \
-       .globl name;                    \
-       __ALIGN;                        \
-       name:
-
-#define KPROBE_END_X86(name)           \
-       __unset_kprobe_x86;             \
-       __check_entry_kprobe_x86;       \
-       .size name, .-name;             \
-       .popsection
-
 #endif /* _ASM_X86_LINKAGE_H */