aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:06:28 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:09:03 -0500
commit6225d85f171f8b7a776850d30352bd196f9bd0d6 (patch)
tree3a3139d1428a78152b383509aaebc04d0a45904e
parent350c20a6fd24b2a3265f7ca440aa17570e89e2cd (diff)
[PATCH] m68k: checksum __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/m68k/lib/checksum.c2
-rw-r--r--include/asm-m68k/checksum.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c
index 4a5c5445c610..cb13c6e3ccae 100644
--- a/arch/m68k/lib/checksum.c
+++ b/arch/m68k/lib/checksum.c
@@ -134,7 +134,7 @@ EXPORT_SYMBOL(csum_partial);
134 */ 134 */
135 135
136unsigned int 136unsigned int
137csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, 137csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
138 int len, int sum, int *csum_err) 138 int len, int sum, int *csum_err)
139{ 139{
140 /* 140 /*
diff --git a/include/asm-m68k/checksum.h b/include/asm-m68k/checksum.h
index 78860c20db01..17280ef719f5 100644
--- a/include/asm-m68k/checksum.h
+++ b/include/asm-m68k/checksum.h
@@ -25,7 +25,7 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
25 * better 64-bit) boundary 25 * better 64-bit) boundary
26 */ 26 */
27 27
28extern unsigned int csum_partial_copy_from_user(const unsigned char *src, 28extern unsigned int csum_partial_copy_from_user(const unsigned char __user *src,
29 unsigned char *dst, 29 unsigned char *dst,
30 int len, int sum, 30 int len, int sum,
31 int *csum_err); 31 int *csum_err);