From a32ec788571744aadd7bb21589ca221e876b2fa1 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 20 Apr 2012 12:19:52 -0700
Subject: [PATCH] --- yaml --- r: 305452 b: refs/heads/master c:
 8f6380b9ec1cc4bed9b38144f739b87dd2cddb1d h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/xen/xen-asm_32.S | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ef8b4c8c0ff6..1438365b0564 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f542c5d6e57ea32daae3708a71911d9f5c883c5a
+refs/heads/master: 8f6380b9ec1cc4bed9b38144f739b87dd2cddb1d
diff --git a/trunk/arch/x86/xen/xen-asm_32.S b/trunk/arch/x86/xen/xen-asm_32.S
index b040b0e518ca..f9643fc50de5 100644
--- a/trunk/arch/x86/xen/xen-asm_32.S
+++ b/trunk/arch/x86/xen/xen-asm_32.S
@@ -14,6 +14,7 @@
 #include <asm/thread_info.h>
 #include <asm/processor-flags.h>
 #include <asm/segment.h>
+#include <asm/asm.h>
 
 #include <xen/interface/xen.h>
 
@@ -137,10 +138,7 @@ iret_restore_end:
 
 1:	iret
 xen_iret_end_crit:
-.section __ex_table, "a"
-	.align 4
-	.long 1b, iret_exc
-.previous
+	_ASM_EXTABLE(1b, iret_exc)
 
 hyper_iret:
 	/* put this out of line since its very rarely used */