diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-04-20 21:12:27 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-04-20 22:51:38 +0200 |
| commit | d4541805e812abb5110d5de83246488fa0aa9a8e (patch) | |
| tree | a98f00e62825de0b1f40c9f43c7d999aadd8e2cb | |
| parent | x86, doc: Revert "x86: Document rdmsr_safe restrictions" (diff) | |
| download | linux-d4541805e812abb5110d5de83246488fa0aa9a8e.tar.xz linux-d4541805e812abb5110d5de83246488fa0aa9a8e.zip | |
x86, extable: Use .pushsection ... .popsection for _ASM_EXTABLE()
Instead of using .section ... .previous, use .pushsection
... .popsection; this is (hopefully) a bit more robust, especially in
complex assembly code.
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
| -rw-r--r-- | arch/x86/include/asm/asm.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index 9412d6558c88..ff3f6bffcbf9 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -42,17 +42,17 @@ /* Exception table entry */ #ifdef __ASSEMBLY__ -# define _ASM_EXTABLE(from,to) \ - __ASM_EX_SEC ; \ - _ASM_ALIGN ; \ - _ASM_PTR from , to ; \ - .previous +# define _ASM_EXTABLE(from,to) \ + .pushsection "__ex_table","a" ; \ + _ASM_ALIGN ; \ + _ASM_PTR from , to ; \ + .popsection #else -# define _ASM_EXTABLE(from,to) \ - __ASM_EX_SEC \ - _ASM_ALIGN "\n" \ - _ASM_PTR #from "," #to "\n" \ - " .previous\n" +# define _ASM_EXTABLE(from,to) \ + " .pushsection \"__ex_table\",\"a\"\n" \ + _ASM_ALIGN "\n" \ + _ASM_PTR #from "," #to "\n" \ + " .popsection\n" #endif #endif /* _ASM_X86_ASM_H */ |