x86: use _ASM_EXTABLE macro in arch/x86/kernel/test_nx.c

Use the _ASM_EXTABLE macro from <asm/asm.h>, instead of open-coding
__ex_table entires in arch/x86/kernel/test_nx.c.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 10 deletions

diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c
index ae0ef2e304c7..36c100c323aa 100644
--- a/arch/x86/kernel/test_nx.c
+++ b/arch/x86/kernel/test_nx.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/sort.h>
 #include <asm/uaccess.h>
+#include <asm/asm.h>
 
 extern int rodata_test_data;
 
@@ -89,16 +90,7 @@ static noinline int test_address(void *address)
                 "2:     mov %[zero], %[rslt]\n"
                 "       ret\n"
                 ".previous\n"
-                ".section __ex_table,\"a\"\n"
-                "       .align 8\n"
-#ifdef CONFIG_X86_32
-                "       .long 0b\n"
-                "       .long 2b\n"
-#else
-                "       .quad 0b\n"
-                "       .quad 2b\n"
-#endif
-                ".previous\n"
+                _ASM_EXTABLE(0b,2b)
                 : [rslt] "=r" (result)
                 : [fake_code] "r" (address), [zero] "r" (0UL), "0" (result)
         );