From 0860e42fffd63bbba37c793905624213821af92c 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: 82851 b: refs/heads/master c:
 f832ff18e886ada0ff30a1edeab082ce218d107e h: refs/heads/master i:   82849:
 d64bd283829582384e75fb333c8ca98f87627c03   82847:
 17c8f5c68070016d285733bc5e5d0dec7015b5fb v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init_32.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 070c024ea412..c877344ebc49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8da804f2b23913ef362c6a578bf482e5ccc93d1a
+refs/heads/master: f832ff18e886ada0ff30a1edeab082ce218d107e
diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
index f2f36f8dae52..d1bc04006d16 100644
--- a/trunk/arch/x86/mm/init_32.c
+++ b/trunk/arch/x86/mm/init_32.c
@@ -31,6 +31,7 @@
 #include <linux/initrd.h>
 #include <linux/cpumask.h>
 
+#include <asm/asm.h>
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -718,10 +719,7 @@ static noinline int do_test_wp_bit(void)
 		"1:	movb %1, %0	\n"
 		"	xorl %2, %2	\n"
 		"2:			\n"
-		".section __ex_table, \"a\"\n"
-		"	.align 4	\n"
-		"	.long 1b, 2b	\n"
-		".previous		\n"
+		_ASM_EXTABLE(1b,2b)
 		:"=m" (*(char *)fix_to_virt(FIX_WP_TEST)),
 		 "=q" (tmp_reg),
 		 "=r" (flag)