m68k: convert to csum_and_copy_from_user()

Al Viro · Al Viro · commit 8084c99b9af6 · 2020-05-29T16:11:49.000-04:00
trivial access_ok() there...

Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git 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
@@ -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);
 
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ EXPORT_SYMBOL(csum_partial);`
`129`	`129`	`*/`
`130`	`130`
`131`	`131`	`__wsum`
`132`		`-csum_partial_copy_from_user(const void __user src, void dst,`
	`132`	`+csum_and_copy_from_user(const void __user src, void dst,`
`133`	`133`	`int len, __wsum sum, int *csum_err)`
`134`	`134`	`{`
`135`	`135`	`/*`
`@@ -316,7 +316,7 @@ csum_partial_copy_from_user(const void __user src, void dst,`
`316`	`316`	`return(sum);`
`317`	`317`	`}`
`318`	`318`
`319`		`-EXPORT_SYMBOL(csum_partial_copy_from_user);`
	`319`	`+EXPORT_SYMBOL(csum_and_copy_from_user);`
`320`	`320`
`321`	`321`
`322`	`322`	`/*`