From 5a81fcbdfecf69e96505b1bb4a5abf59a45b8c33 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 20 Apr 2012 12:19:50 -0700
Subject: [PATCH] --- yaml --- r: 305443 b: refs/heads/master c:
 5d6f8d77ede50417dcca4c31a74f0d40a1ee537a h: refs/heads/master i:   305441:
 fdaa0c5b175e941e299b4aac66ccb33862ddc4a6   305439:
 449552a550f62d49865d441049745a5b05eceb75 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/x86/kernel/test_rodata.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2268ba818cdf..97eb3e2f2c67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7abc0fa997972ddb6d3c403e03a6eefda0c0881
+refs/heads/master: 5d6f8d77ede50417dcca4c31a74f0d40a1ee537a
diff --git a/trunk/arch/x86/kernel/test_rodata.c b/trunk/arch/x86/kernel/test_rodata.c
index c29e235792af..b79133abda48 100644
--- a/trunk/arch/x86/kernel/test_rodata.c
+++ b/trunk/arch/x86/kernel/test_rodata.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <asm/cacheflush.h>
 #include <asm/sections.h>
+#include <asm/asm.h>
 
 int rodata_test(void)
 {
@@ -42,14 +43,7 @@ int rodata_test(void)
 		".section .fixup,\"ax\"\n"
 		"2:	jmp 1b\n"
 		".previous\n"
-		".section __ex_table,\"a\"\n"
-		"       .align 16\n"
-#ifdef CONFIG_X86_32
-		"	.long 0b,2b\n"
-#else
-		"	.quad 0b,2b\n"
-#endif
-		".previous"
+		_ASM_EXTABLE(0b,2b)
 		: [rslt] "=r" (result)
 		: [rodata_test] "r" (&rodata_test_data), [zero] "r" (0UL)
 	);