From ce3450745297cc73440a9f8aa2506735a6a4a74a 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: 305451 b: refs/heads/master c:
 f542c5d6e57ea32daae3708a71911d9f5c883c5a h: refs/heads/master i:   305449:
 a00215481630cb0f93d53c408d670316ba2e43ff   305447:
 d88a47e89bf148c8b8b3628048c19d0cc382e253 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/um/checksum_32.S | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a08d4bb82296..ef8b4c8c0ff6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c6751280b6206e2a96f9600938003a29968e4fa
+refs/heads/master: f542c5d6e57ea32daae3708a71911d9f5c883c5a
diff --git a/trunk/arch/x86/um/checksum_32.S b/trunk/arch/x86/um/checksum_32.S
index f058d2f82e18..8d0c420465cc 100644
--- a/trunk/arch/x86/um/checksum_32.S
+++ b/trunk/arch/x86/um/checksum_32.S
@@ -26,6 +26,7 @@
  */
 
 #include <asm/errno.h>
+#include <asm/asm.h>
 				
 /*
  * computes a partial checksum, e.g. for TCP/UDP fragments
@@ -232,15 +233,11 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
 
 #define SRC(y...)			\
 	9999: y;			\
-	.section __ex_table, "a";	\
-	.long 9999b, 6001f	;	\
-	.previous
+	_ASM_EXTABLE(9999b, 6001f)
 
 #define DST(y...)			\
 	9999: y;			\
-	.section __ex_table, "a";	\
-	.long 9999b, 6002f	;	\
-	.previous
+	_ASM_EXTABLE(9999b, 6002f)
 
 .align 4