summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/asm.h
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-06-24 12:05:11 -0300
committerIngo Molnar <mingo@elte.hu>2008-07-09 09:14:05 +0200
commit6c2d458680d49d939ffd4b4cdc84d9e004d65910 (patch)
tree074be66f819fdf326e8480139a01e489f5a41929 /include/asm-x86/asm.h
parent87e2f1e7f6ab66306320403d4502d7938d3c703e (diff)
x86: merge getuser asm functions.
getuser_32.S and getuser_64.S are merged into getuser.S. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/asm.h')
-rw-r--r--include/asm-x86/asm.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h
index 435402e623e..57750a95685 100644
--- a/include/asm-x86/asm.h
+++ b/include/asm-x86/asm.h
@@ -3,8 +3,10 @@
#ifdef __ASSEMBLY__
# define __ASM_FORM(x) x
+# define __ASM_EX_SEC .section __ex_table
#else
# define __ASM_FORM(x) " " #x " "
+# define __ASM_EX_SEC " .section __ex_table,\"a\"\n"
#endif
#ifdef CONFIG_X86_32
@@ -30,7 +32,7 @@
/* Exception table entry */
# define _ASM_EXTABLE(from,to) \
- " .section __ex_table,\"a\"\n" \
+ __ASM_EX_SEC \
_ASM_ALIGN "\n" \
_ASM_PTR #from "," #to "\n" \
" .previous\n"