diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-04-20 16:42:25 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-04-20 16:51:40 -0400 |
| commit | 7a040a4384c7c4973deb4d58a76e1b0ee3c8aa39 (patch) | |
| tree | 9075748645bc45e8023c68537b460ccd21c2fa5c | |
| parent | 3ee89722cfb165295cc8eb498018c0bdafc57062 (diff) | |
x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/xsave.h
Remove open-coded exception table entries in arch/x86/include/asm/xsave.h,
and replace them with _ASM_EXTABLE() macros; this will allow us to
change the format and type of the exception table entries.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Link: http://lkml.kernel.org/r/CA%2B55aFyijf43qSu3N9nWHEBwaGbb7T2Oq9A=9EyR=Jtyqfq_cQ@mail.gmail.com
| -rw-r--r-- | arch/x86/include/asm/xsave.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h index c6ce2452f10c..8a1b6f9b594a 100644 --- a/arch/x86/include/asm/xsave.h +++ b/arch/x86/include/asm/xsave.h | |||
| @@ -80,10 +80,7 @@ static inline int xsave_user(struct xsave_struct __user *buf) | |||
| 80 | "3: movl $-1,%[err]\n" | 80 | "3: movl $-1,%[err]\n" |
| 81 | " jmp 2b\n" | 81 | " jmp 2b\n" |
| 82 | ".previous\n" | 82 | ".previous\n" |
| 83 | ".section __ex_table,\"a\"\n" | 83 | _ASM_EXTABLE(1b,3b) |
| 84 | _ASM_ALIGN "\n" | ||
| 85 | _ASM_PTR "1b,3b\n" | ||
| 86 | ".previous" | ||
| 87 | : [err] "=r" (err) | 84 | : [err] "=r" (err) |
| 88 | : "D" (buf), "a" (-1), "d" (-1), "0" (0) | 85 | : "D" (buf), "a" (-1), "d" (-1), "0" (0) |
| 89 | : "memory"); | 86 | : "memory"); |
| @@ -106,10 +103,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask) | |||
| 106 | "3: movl $-1,%[err]\n" | 103 | "3: movl $-1,%[err]\n" |
| 107 | " jmp 2b\n" | 104 | " jmp 2b\n" |
| 108 | ".previous\n" | 105 | ".previous\n" |
| 109 | ".section __ex_table,\"a\"\n" | 106 | _ASM_EXTABLE(1b,3b) |
| 110 | _ASM_ALIGN "\n" | ||
| 111 | _ASM_PTR "1b,3b\n" | ||
| 112 | ".previous" | ||
| 113 | : [err] "=r" (err) | 107 | : [err] "=r" (err) |
| 114 | : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0) | 108 | : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0) |
| 115 | : "memory"); /* memory required? */ | 109 | : "memory"); /* memory required? */ |