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

---
 [refs]                            |  2 +-
 trunk/arch/x86/lib/csum-copy_64.S | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 8e343574e2cd..4000bb13d957 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d8559feafbc9dc5a2c17ba42aea7de824b18308
+refs/heads/master: 015e6f11a9737684469feef9d523373b1746159d
diff --git a/trunk/arch/x86/lib/csum-copy_64.S b/trunk/arch/x86/lib/csum-copy_64.S
index fb903b758da8..2419d5fefae3 100644
--- a/trunk/arch/x86/lib/csum-copy_64.S
+++ b/trunk/arch/x86/lib/csum-copy_64.S
@@ -8,6 +8,7 @@
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
 #include <asm/errno.h>
+#include <asm/asm.h>
 
 /*
  * Checksum copy with exception handling.
@@ -31,26 +32,17 @@
 
 	.macro source
 10:
-	.section __ex_table, "a"
-	.align 8
-	.quad 10b, .Lbad_source
-	.previous
+	_ASM_EXTABLE(10b, .Lbad_source)
 	.endm
 
 	.macro dest
 20:
-	.section __ex_table, "a"
-	.align 8
-	.quad 20b, .Lbad_dest
-	.previous
+	_ASM_EXTABLE(20b, .Lbad_dest)
 	.endm
 
 	.macro ignore L=.Lignore
 30:
-	.section __ex_table, "a"
-	.align 8
-	.quad 30b, \L
-	.previous
+	_ASM_EXTABLE(30b, \L)
 	.endm