lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H. Peter Anvin
2008-02-04 16:47:56 +01:00
committed by Ingo Molnar
parent a34746bc43
commit 92909098a3
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/kernel/test_nx.c
View File

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