summaryrefslogtreecommitdiffstats
path: root/arch/m68k/lib
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 10:06:28 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 18:09:03 +0100
commit6225d85f171f8b7a776850d30352bd196f9bd0d6 (patch)
tree3a3139d1428a78152b383509aaebc04d0a45904e /arch/m68k/lib
parent[PATCH] m68k: syscalls __user annotation (diff)
downloadlinux-6225d85f171f8b7a776850d30352bd196f9bd0d6.tar.xz
linux-6225d85f171f8b7a776850d30352bd196f9bd0d6.zip
[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>
Diffstat (limited to 'arch/m68k/lib')
-rw-r--r--arch/m68k/lib/checksum.c2
1 files changed, 1 insertions, 1 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);
*/
unsigned int
-csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst,
+csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
int len, int sum, int *csum_err)
{
/*