From 449552a550f62d49865d441049745a5b05eceb75 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 20 Apr 2012 12:12:27 -0700
Subject: [PATCH] --- yaml --- r: 305439 b: refs/heads/master c:
 d4541805e812abb5110d5de83246488fa0aa9a8e h: refs/heads/master i:   305437:
 c138054d0fe71e6d62e1c6bb7c5394a81266faaf   305435:
 1a56135e124abfff221480a215b568bc6be90fe8   305431:
 6db9ce0073137be94ef878d4bc5c5d49bdfc44b2   305423:
 c9e4d1d2d57725334da49ad5aea77a8bc410adf8   305407:
 41e60bf5518ac088a48e5450ed001cdb5514f443 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/include/asm/asm.h | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index abee7b73ea73..f74c318af5ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 060feb650010c261fcfbae9de9348b46cedcd3cd
+refs/heads/master: d4541805e812abb5110d5de83246488fa0aa9a8e
diff --git a/trunk/arch/x86/include/asm/asm.h b/trunk/arch/x86/include/asm/asm.h
index 9412d6558c88..ff3f6bffcbf9 100644
--- a/trunk/arch/x86/include/asm/asm.h
+++ b/trunk/arch/x86/include/asm/asm.h
@@ -42,17 +42,17 @@
 
 /* Exception table entry */
 #ifdef __ASSEMBLY__
-# define _ASM_EXTABLE(from,to)	    \
-	__ASM_EX_SEC ;		    \
-	_ASM_ALIGN ;		    \
-	_ASM_PTR from , to ;	    \
-	.previous
+# define _ASM_EXTABLE(from,to)			\
+	.pushsection "__ex_table","a" ;		\
+	_ASM_ALIGN ;				\
+	_ASM_PTR from , to ;			\
+	.popsection
 #else
-# define _ASM_EXTABLE(from,to) \
-	__ASM_EX_SEC	\
-	_ASM_ALIGN "\n" \
-	_ASM_PTR #from "," #to "\n" \
-	" .previous\n"
+# define _ASM_EXTABLE(from,to)			\
+	" .pushsection \"__ex_table\",\"a\"\n"	\
+	_ASM_ALIGN "\n" 			\
+	_ASM_PTR #from "," #to "\n" 		\
+	" .popsection\n"
 #endif
 
 #endif /* _ASM_X86_ASM_H */