m68k: convert to csum_and_copy_from_user()

trivial access_ok() there...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/m68k/include/asm/checksum.h b/arch/m68k/include/asm/checksum.h
index f9b94e4b94f97b9ca473f8679ed0dcec46fa829f..3f2c15d6f18c03bb3f73d3de21489dc9240811cf 100644 (file)
--- a/arch/m68k/include/asm/checksum.h
+++ b/arch/m68k/include/asm/checksum.h
@@ -30,7 +30,8 @@ __wsum csum_partial(const void *buff, int len, __wsum sum);
  * better 64-bit) boundary
  */
 
-extern __wsum csum_partial_copy_from_user(const void __user *src,
+#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
+extern __wsum csum_and_copy_from_user(const void __user *src,
                                                void *dst,
                                                int len, __wsum sum,
                                                int *csum_err);

diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c
index 5fa3d392e181de41ef06a894a9b18d727be4fe26..31797be9a3dc49b4e4196032f7f68d71a1811789 100644 (file)
--- a/arch/m68k/lib/checksum.c
+++ b/arch/m68k/lib/checksum.c
@@ -129,7 +129,7 @@ EXPORT_SYMBOL(csum_partial);
  */
 
 __wsum
-csum_partial_copy_from_user(const void __user *src, void *dst,
+csum_and_copy_from_user(const void __user *src, void *dst,
                            int len, __wsum sum, int *csum_err)
 {
        /*
@@ -316,7 +316,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
        return(sum);
 }
 
-EXPORT_SYMBOL(csum_partial_copy_from_user);
+EXPORT_SYMBOL(csum_and_copy_from_user);
 
 
 /*