From 35353086f23635d0b40acaaa1f81049cb4222965 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 31 Aug 2009 11:57:20 -0700 Subject: [PATCH] --- yaml --- r: 158692 b: refs/heads/master c: 709972b1f6f70535d1fddbe1243a51b90c408a1c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/asm.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c4861c39da8..d0f009ef6dfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe9b4e4e40ffdabbd385cdf171cb861c2fd517c0 +refs/heads/master: 709972b1f6f70535d1fddbe1243a51b90c408a1c diff --git a/trunk/arch/x86/include/asm/asm.h b/trunk/arch/x86/include/asm/asm.h index 56be78f582f0..b3ed1e1460ff 100644 --- a/trunk/arch/x86/include/asm/asm.h +++ b/trunk/arch/x86/include/asm/asm.h @@ -3,7 +3,7 @@ #ifdef __ASSEMBLY__ # define __ASM_FORM(x) x -# define __ASM_EX_SEC .section __ex_table +# define __ASM_EX_SEC .section __ex_table, "a" #else # define __ASM_FORM(x) " " #x " " # define __ASM_EX_SEC " .section __ex_table,\"a\"\n" @@ -38,10 +38,18 @@ #define _ASM_DI __ASM_REG(di) /* Exception table entry */ +#ifdef __ASSEMBLY__ +# define _ASM_EXTABLE(from,to) \ + __ASM_EX_SEC ; \ + _ASM_ALIGN ; \ + _ASM_PTR from , to ; \ + .previous +#else # define _ASM_EXTABLE(from,to) \ __ASM_EX_SEC \ _ASM_ALIGN "\n" \ _ASM_PTR #from "," #to "\n" \ " .previous\n" +#endif #endif /* _ASM_X86_ASM_H */