From a00215481630cb0f93d53c408d670316ba2e43ff Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 20 Apr 2012 12:19:52 -0700
Subject: [PATCH] --- yaml --- r: 305449 b: refs/heads/master c:
 a53a96e5413d3639ed75d202bbfe68aa0a56c091 h: refs/heads/master i:   305447:
 d88a47e89bf148c8b8b3628048c19d0cc382e253 v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/lib/putuser.S | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b16a6df22121..083498e81f67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a27bc0d99aabea6b628cb994a21a1c79b569fc9
+refs/heads/master: a53a96e5413d3639ed75d202bbfe68aa0a56c091
diff --git a/trunk/arch/x86/lib/putuser.S b/trunk/arch/x86/lib/putuser.S
index 36b0d15ae6e9..7f951c8f76c4 100644
--- a/trunk/arch/x86/lib/putuser.S
+++ b/trunk/arch/x86/lib/putuser.S
@@ -86,12 +86,10 @@ bad_put_user:
 	EXIT
 END(bad_put_user)
 
-.section __ex_table,"a"
-	_ASM_PTR 1b,bad_put_user
-	_ASM_PTR 2b,bad_put_user
-	_ASM_PTR 3b,bad_put_user
-	_ASM_PTR 4b,bad_put_user
+	_ASM_EXTABLE(1b,bad_put_user)
+	_ASM_EXTABLE(2b,bad_put_user)
+	_ASM_EXTABLE(3b,bad_put_user)
+	_ASM_EXTABLE(4b,bad_put_user)
 #ifdef CONFIG_X86_32
-	_ASM_PTR 5b,bad_put_user
+	_ASM_EXTABLE(5b,bad_put_user)
 #endif
-.previous