x86, extable: Remove open-coded exception table entries in arch/x86/lib/csum-copy_64.S

Remove open-coded exception table entries in arch/x86/lib/csum-copy_64.S,
and replace them with _ASM_EXTABLE() macros; this will allow us to
change the format and type of the exception table entries.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: David Daney <david.daney@cavium.com>
Link: http://lkml.kernel.org/r/CA%2B55aFyijf43qSu3N9nWHEBwaGbb7T2Oq9A=9EyR=Jtyqfq_cQ@mail.gmail.com

diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
index fb903b758da8534847ef3c4c97840d91972abdf4..2419d5fefae30ac2453fabf71c633ede013d2e4a 100644 (file)
--- a/arch/x86/lib/csum-copy_64.S
+++ b/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