From 63ab68eecc4caa37a77b1ea478dbe085a374b1af Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 20 Apr 2012 13:42:25 -0700
Subject: [PATCH] --- yaml --- r: 305455 b: refs/heads/master c:
 7a040a4384c7c4973deb4d58a76e1b0ee3c8aa39 h: refs/heads/master i:   305453:
 b36c098ab1613c287fcd237b65c7a83bef52cce7   305451:
 ce3450745297cc73440a9f8aa2506735a6a4a74a   305447:
 d88a47e89bf148c8b8b3628048c19d0cc382e253   305439:
 449552a550f62d49865d441049745a5b05eceb75 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/include/asm/xsave.h | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 19621125d096..cbaed088a0d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee89722cfb165295cc8eb498018c0bdafc57062
+refs/heads/master: 7a040a4384c7c4973deb4d58a76e1b0ee3c8aa39
diff --git a/trunk/arch/x86/include/asm/xsave.h b/trunk/arch/x86/include/asm/xsave.h
index c6ce2452f10c..8a1b6f9b594a 100644
--- a/trunk/arch/x86/include/asm/xsave.h
+++ b/trunk/arch/x86/include/asm/xsave.h
@@ -80,10 +80,7 @@ static inline int xsave_user(struct xsave_struct __user *buf)
 			     "3:  movl $-1,%[err]\n"
 			     "    jmp  2b\n"
 			     ".previous\n"
-			     ".section __ex_table,\"a\"\n"
-			     _ASM_ALIGN "\n"
-			     _ASM_PTR "1b,3b\n"
-			     ".previous"
+			     _ASM_EXTABLE(1b,3b)
 			     : [err] "=r" (err)
 			     : "D" (buf), "a" (-1), "d" (-1), "0" (0)
 			     : "memory");
@@ -106,10 +103,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
 			     "3:  movl $-1,%[err]\n"
 			     "    jmp  2b\n"
 			     ".previous\n"
-			     ".section __ex_table,\"a\"\n"
-			     _ASM_ALIGN "\n"
-			     _ASM_PTR "1b,3b\n"
-			     ".previous"
+			     _ASM_EXTABLE(1b,3b)
 			     : [err] "=r" (err)
 			     : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
 			     : "memory");	/* memory required? */