mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-10 23:29:46 +00:00
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
This commit is contained in:
parent
d7abc0fa99
commit
5d6f8d77ed
@ -12,6 +12,7 @@
|
|||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
|
#include <asm/asm.h>
|
||||||
|
|
||||||
int rodata_test(void)
|
int rodata_test(void)
|
||||||
{
|
{
|
||||||
@ -42,14 +43,7 @@ int rodata_test(void)
|
|||||||
".section .fixup,\"ax\"\n"
|
".section .fixup,\"ax\"\n"
|
||||||
"2: jmp 1b\n"
|
"2: jmp 1b\n"
|
||||||
".previous\n"
|
".previous\n"
|
||||||
".section __ex_table,\"a\"\n"
|
_ASM_EXTABLE(0b,2b)
|
||||||
" .align 16\n"
|
|
||||||
#ifdef CONFIG_X86_32
|
|
||||||
" .long 0b,2b\n"
|
|
||||||
#else
|
|
||||||
" .quad 0b,2b\n"
|
|
||||||
#endif
|
|
||||||
".previous"
|
|
||||||
: [rslt] "=r" (result)
|
: [rslt] "=r" (result)
|
||||||
: [rodata_test] "r" (&rodata_test_data), [zero] "r" (0UL)
|
: [rodata_test] "r" (&rodata_test_data), [zero] "r" (0UL)
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user