Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a040a43 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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: default avatarH. 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
parent 3ee89722

arch/x86/include/asm/xsave.h

+2 −8
Original line number Original line Diff line number Diff line
@@ -80,10 +80,7 @@ static inline int xsave_user(struct xsave_struct __user *buf) 
			     "3:  movl $-1,%[err]\n"

			     "3:  movl $-1,%[err]\n"

			     "    jmp  2b\n"

			     "    jmp  2b\n"

			     ".previous\n"

			     ".previous\n"

			     ".section __ex_table,\"a\"\n"

			     _ASM_EXTABLE(1b,3b)

			     _ASM_ALIGN "\n"

			     _ASM_PTR "1b,3b\n"

			     ".previous"

			     : [err] "=r" (err)

			     : [err] "=r" (err)

			     : "D" (buf), "a" (-1), "d" (-1), "0" (0)

			     : "D" (buf), "a" (-1), "d" (-1), "0" (0)

			     : "memory");

			     : "memory");
@@ -106,10 +103,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask) 
			     "3:  movl $-1,%[err]\n"

			     "3:  movl $-1,%[err]\n"

			     "    jmp  2b\n"

			     "    jmp  2b\n"

			     ".previous\n"

			     ".previous\n"

			     ".section __ex_table,\"a\"\n"

			     _ASM_EXTABLE(1b,3b)

			     _ASM_ALIGN "\n"

			     _ASM_PTR "1b,3b\n"

			     ".previous"

			     : [err] "=r" (err)

			     : [err] "=r" (err)

			     : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)

			     : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)

			     : "memory");	/* memory required? */

			     : "memory");	/* memory required? */