diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-02-04 10:47:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-04 10:47:57 -0500 |
| commit | 287774414568010855642518513f085491644061 (patch) | |
| tree | c00ef68f10e578702a5b713d9ea77044ea1c5ede /arch/x86/lib | |
| parent | e7a40d268ec2afab7e0596667cabd2ae53fec8d8 (diff) | |
x86: use _ASM_EXTABLE macro in arch/x86/lib/usercopy_32.c
Use the _ASM_EXTABLE macro from <asm/asm.h>, instead of open-coding
__ex_table entires in arch/x86/lib/usercopy_32.c.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/usercopy_32.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index 9c4ffd5bedb2..e849b9998b0e 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c | |||
| @@ -48,10 +48,7 @@ do { \ | |||
| 48 | "3: movl %5,%0\n" \ | 48 | "3: movl %5,%0\n" \ |
| 49 | " jmp 2b\n" \ | 49 | " jmp 2b\n" \ |
| 50 | ".previous\n" \ | 50 | ".previous\n" \ |
| 51 | ".section __ex_table,\"a\"\n" \ | 51 | _ASM_EXTABLE(0b,3b) \ |
| 52 | " .align 4\n" \ | ||
| 53 | " .long 0b,3b\n" \ | ||
| 54 | ".previous" \ | ||
| 55 | : "=d"(res), "=c"(count), "=&a" (__d0), "=&S" (__d1), \ | 52 | : "=d"(res), "=c"(count), "=&a" (__d0), "=&S" (__d1), \ |
| 56 | "=&D" (__d2) \ | 53 | "=&D" (__d2) \ |
| 57 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \ | 54 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \ |
| @@ -132,11 +129,8 @@ do { \ | |||
| 132 | "3: lea 0(%2,%0,4),%0\n" \ | 129 | "3: lea 0(%2,%0,4),%0\n" \ |
| 133 | " jmp 2b\n" \ | 130 | " jmp 2b\n" \ |
| 134 | ".previous\n" \ | 131 | ".previous\n" \ |
| 135 | ".section __ex_table,\"a\"\n" \ | 132 | _ASM_EXTABLE(0b,3b) \ |
| 136 | " .align 4\n" \ | 133 | _ASM_EXTABLE(1b,2b) \ |
| 137 | " .long 0b,3b\n" \ | ||
| 138 | " .long 1b,2b\n" \ | ||
| 139 | ".previous" \ | ||
| 140 | : "=&c"(size), "=&D" (__d0) \ | 134 | : "=&c"(size), "=&D" (__d0) \ |
| 141 | : "r"(size & 3), "0"(size / 4), "1"(addr), "a"(0)); \ | 135 | : "r"(size & 3), "0"(size / 4), "1"(addr), "a"(0)); \ |
| 142 | } while (0) | 136 | } while (0) |