diff options
| author |   H. Peter Anvin <hpa@zytor.com> | 2012-04-20 12:19:50 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-04-20 13:51:38 -0700 |
| commit | 5d6f8d77ede50417dcca4c31a74f0d40a1ee537a (patch) | |
| tree | 140d7cecdbc71d64dfa9888f68b9d7d5e954c1b6 /arch/x86/kernel/test_rodata.c | |
| parent | x86, extable: Remove open-coded exception table entries in arch/x86/kernel/entry_64.S (diff) | |
| download | linux-dev-5d6f8d77ede50417dcca4c31a74f0d40a1ee537a.tar.xz linux-dev-5d6f8d77ede50417dcca4c31a74f0d40a1ee537a.zip | |
x86, extable: Remove open-coded exception table entries in arch/x86/kernel/test_rodata.c
Remove open-coded exception table entries in arch/x86/kernel/test_rodata.c,
and replace them with _ASM_EXTABLE() macros; this will allow us to
change the format and type of the exception table entries.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: David Daney <david.daney@cavium.com>
Link: http://lkml.kernel.org/r/CA%2B55aFyijf43qSu3N9nWHEBwaGbb7T2Oq9A=9EyR=Jtyqfq_cQ@mail.gmail.com
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kernel/test_rodata.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kernel/test_rodata.c b/arch/x86/kernel/test_rodata.c index c29e235792af..b79133abda48 100644 --- a/arch/x86/kernel/test_rodata.c +++ b/arch/x86/kernel/test_rodata.c @@ -12,6 +12,7 @@ #include <linux/module.h> #include <asm/cacheflush.h> #include <asm/sections.h> +#include <asm/asm.h> int rodata_test(void) { @@ -42,14 +43,7 @@ int rodata_test(void) ".section .fixup,\"ax\"\n" "2: jmp 1b\n" ".previous\n" - ".section __ex_table,\"a\"\n" - " .align 16\n" -#ifdef CONFIG_X86_32 - " .long 0b,2b\n" -#else - " .quad 0b,2b\n" -#endif - ".previous" + _ASM_EXTABLE(0b,2b) : [rslt] "=r" (result) : [rodata_test] "r" (&rodata_test_data), [zero] "r" (0UL) ); |