From 17c8f5c68070016d285733bc5e5d0dec7015b5fb Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 4 Feb 2008 16:47:56 +0100
Subject: [PATCH] --- yaml --- r: 82847 b: refs/heads/master c:
 92909098a3b27147c4b80f9c387ccd63676aa807 h: refs/heads/master i:   82845:
 aa7ca6dfef7b0b328cca749997be0b372d280f96   82843:
 8d386c4f9f751eeb0f3d08793c1bef3272c33c29   82839:
 895d3d65bf4e83fd8ab0e116fe693dca70d936f2   82831:
 559e8324d310995af831d4e9d974ce0e67cffdf7   82815:
 ea18d4ab0718b290727e7ba23dc60f5956183fa4 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/kernel/test_nx.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 12f32cceba36..6bca24e2e8a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a34746bc43eb63e545abf5eb002d96483a54ee32
+refs/heads/master: 92909098a3b27147c4b80f9c387ccd63676aa807
diff --git a/trunk/arch/x86/kernel/test_nx.c b/trunk/arch/x86/kernel/test_nx.c
index ae0ef2e304c7..36c100c323aa 100644
--- a/trunk/arch/x86/kernel/test_nx.c
+++ b/trunk/arch/x86/kernel/test_nx.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/sort.h>
 #include <asm/uaccess.h>
+#include <asm/asm.h>
 
 extern int rodata_test_data;
 
@@ -89,16 +90,7 @@ static noinline int test_address(void *address)
 		"2:	mov %[zero], %[rslt]\n"
 		"	ret\n"
 		".previous\n"
-		".section __ex_table,\"a\"\n"
-		"       .align 8\n"
-#ifdef CONFIG_X86_32
-		"	.long 0b\n"
-		"	.long 2b\n"
-#else
-		"	.quad 0b\n"
-		"	.quad 2b\n"
-#endif
-		".previous\n"
+		_ASM_EXTABLE(0b,2b)
 		: [rslt] "=r" (result)
 		: [fake_code] "r" (address), [zero] "r" (0UL), "0" (result)
 	);