diff --git a/[refs] b/[refs] index abee7b73ea73..f74c318af5ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 060feb650010c261fcfbae9de9348b46cedcd3cd +refs/heads/master: d4541805e812abb5110d5de83246488fa0aa9a8e diff --git a/trunk/arch/x86/include/asm/asm.h b/trunk/arch/x86/include/asm/asm.h index 9412d6558c88..ff3f6bffcbf9 100644 --- a/trunk/arch/x86/include/asm/asm.h +++ b/trunk/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 */