diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-06-24 11:05:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 03:14:05 -0400 |
| commit | 6c2d458680d49d939ffd4b4cdc84d9e004d65910 (patch) | |
| tree | 074be66f819fdf326e8480139a01e489f5a41929 /include | |
| parent | 87e2f1e7f6ab66306320403d4502d7938d3c703e (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')
| -rw-r--r-- | include/asm-x86/asm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h index 435402e623e1..57750a95685d 100644 --- a/include/asm-x86/asm.h +++ b/include/asm-x86/asm.h | |||
| @@ -3,8 +3,10 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __ASSEMBLY__ | 4 | #ifdef __ASSEMBLY__ |
| 5 | # define __ASM_FORM(x) x | 5 | # define __ASM_FORM(x) x |
| 6 | # define __ASM_EX_SEC .section __ex_table | ||
| 6 | #else | 7 | #else |
| 7 | # define __ASM_FORM(x) " " #x " " | 8 | # define __ASM_FORM(x) " " #x " " |
| 9 | # define __ASM_EX_SEC " .section __ex_table,\"a\"\n" | ||
| 8 | #endif | 10 | #endif |
| 9 | 11 | ||
| 10 | #ifdef CONFIG_X86_32 | 12 | #ifdef CONFIG_X86_32 |
| @@ -30,7 +32,7 @@ | |||
| 30 | 32 | ||
| 31 | /* Exception table entry */ | 33 | /* Exception table entry */ |
| 32 | # define _ASM_EXTABLE(from,to) \ | 34 | # define _ASM_EXTABLE(from,to) \ |
| 33 | " .section __ex_table,\"a\"\n" \ | 35 | __ASM_EX_SEC \ |
| 34 | _ASM_ALIGN "\n" \ | 36 | _ASM_ALIGN "\n" \ |
| 35 | _ASM_PTR #from "," #to "\n" \ | 37 | _ASM_PTR #from "," #to "\n" \ |
| 36 | " .previous\n" | 38 | " .previous\n" |