From 609d54f76f03df2bea4917cd9170780aa3544993 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 4 Feb 2008 16:47:58 +0100
Subject: [PATCH] --- yaml --- r: 82855 b: refs/heads/master c:
 88976ee187dce4c8de56e25955631de9765d96d1 h: refs/heads/master i:   82853:
 aeca0fc1cc137014e939b196918e0e76fbac51e8   82851:
 0860e42fffd63bbba37c793905624213821af92c   82847:
 17c8f5c68070016d285733bc5e5d0dec7015b5fb v: v3

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

diff --git a/[refs] b/[refs]
index 382eccd2aac9..66d572dad80a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d24a827087e0cf6834a3d8f20c4b5fc4cebd7fc
+refs/heads/master: 88976ee187dce4c8de56e25955631de9765d96d1
diff --git a/trunk/include/asm-x86/system.h b/trunk/include/asm-x86/system.h
index ee32ef9367f4..428348e990bf 100644
--- a/trunk/include/asm-x86/system.h
+++ b/trunk/include/asm-x86/system.h
@@ -130,10 +130,7 @@ extern void load_gs_index(unsigned);
 		"movl %k1, %%" #seg "\n\t"	\
 		"jmp 2b\n"			\
 		".previous\n"			\
-		".section __ex_table,\"a\"\n\t"	\
-		_ASM_ALIGN "\n\t"		\
-		_ASM_PTR " 1b,3b\n"		\
-		".previous"			\
+		_ASM_EXTABLE(1b,3b)		\
 		: :"r" (value), "r" (0))
 
 
@@ -214,12 +211,10 @@ static inline unsigned long native_read_cr4_safe(void)
 	/* This could fault if %cr4 does not exist. In x86_64, a cr4 always
 	 * exists, so it will never fail. */
 #ifdef CONFIG_X86_32
-	asm volatile("1: mov %%cr4, %0		\n"
-		"2:				\n"
-		".section __ex_table,\"a\"	\n"
-		".long 1b,2b			\n"
-		".previous			\n"
-		: "=r" (val), "=m" (__force_order) : "0" (0));
+	asm volatile("1: mov %%cr4, %0\n"
+		     "2:\n"
+		     _ASM_EXTABLE(1b,2b)
+		     : "=r" (val), "=m" (__force_order) : "0" (0));
 #else
 	val = native_read_cr4();
 #endif