Skip to content

Commit

Permalink
x86, extable: Remove open-coded exception table entries in arch/x86/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
H. Peter Anvin committed Apr 20, 2012
1 parent d7abc0f commit 5d6f8d7
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions arch/x86/kernel/test_rodata.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/module.h>
#include <asm/cacheflush.h>
#include <asm/sections.h>
#include <asm/asm.h>

int rodata_test(void)
{
Expand Down Expand Up @@ -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)
);
Expand Down

0 comments on commit 5d6f8d7

Please sign in to comment.