summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/asm.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-04-21 03:57:35 +0400
committerH. Peter Anvin <hpa@zytor.com>2012-04-21 03:57:35 +0400
commit535c0c34698061544f81a51c65fc51f4eeeebff6 (patch)
tree76f4ad3784af2be36407f5da28b8d1adb77b105a /arch/x86/include/asm/asm.h
parenta3e859fed1244b72253718e076a724ffe13a9584 (diff)
downloadlinux-535c0c34698061544f81a51c65fc51f4eeeebff6.tar.xz
x86, extable: Add _ASM_EXTABLE_EX() macro
Add _ASM_EXTABLE_EX() to generate the special extable entries that are associated with uaccess_err. This allows us to change the protocol associated with these special 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
Diffstat (limited to 'arch/x86/include/asm/asm.h')
-rw-r--r--arch/x86/include/asm/asm.h28
1 files changed, 20 insertions, 8 deletions
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 53dce41f2517..0f15e8a4f565 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -40,16 +40,28 @@
/* Exception table entry */
#ifdef __ASSEMBLY__
-# define _ASM_EXTABLE(from,to) \
- .pushsection "__ex_table","a" ; \
- _ASM_ALIGN ; \
- _ASM_PTR from , to ; \
+# define _ASM_EXTABLE(from,to) \
+ .pushsection "__ex_table","a" ; \
+ _ASM_ALIGN ; \
+ _ASM_PTR from , to ; \
+ .popsection
+
+# define _ASM_EXTABLE_EX(from,to) \
+ .pushsection "__ex_table","a" ; \
+ _ASM_ALIGN ; \
+ _ASM_PTR from , (to) - (from) ; \
.popsection
#else
-# define _ASM_EXTABLE(from,to) \
- " .pushsection \"__ex_table\",\"a\"\n" \
- _ASM_ALIGN "\n" \
- _ASM_PTR #from "," #to "\n" \
+# define _ASM_EXTABLE(from,to) \
+ " .pushsection \"__ex_table\",\"a\"\n" \
+ _ASM_ALIGN "\n" \
+ _ASM_PTR #from "," #to "\n" \
+ " .popsection\n"
+
+# define _ASM_EXTABLE_EX(from,to) \
+ " .pushsection \"__ex_table\",\"a\"\n" \
+ _ASM_ALIGN "\n" \
+ _ASM_PTR #from ",(" #to ")-(" #from ")\n" \
" .popsection\n"
#endif