]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
x86, extable: Remove open-coded exception table entries in arch/x86/lib/checksum_32.S
authorH. Peter Anvin <hpa@zytor.com>
Fri, 20 Apr 2012 19:19:50 +0000 (12:19 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 20 Apr 2012 20:51:38 +0000 (13:51 -0700)
Remove open-coded exception table entries in arch/x86/lib/checksum_32.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
arch/x86/lib/checksum_32.S

index 78d16a554db00f51c13b7d49df2c4cfafabcb276..2af5df3ade7c03e70f3056617d5982540a8cb5b8 100644 (file)
@@ -28,6 +28,7 @@
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
 #include <asm/errno.h>
+#include <asm/asm.h>
                                
 /*
  * computes a partial checksum, e.g. for TCP/UDP fragments
@@ -282,15 +283,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)
 
 #ifndef CONFIG_X86_USE_PPRO_CHECKSUM