From: Al Viro Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton --- arch/m68k/lib/checksum.c | 2 +- include/asm-m68k/checksum.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/m68k/lib/checksum.c~m68k-checksum-__user-annotations arch/m68k/lib/checksum.c --- devel/arch/m68k/lib/checksum.c~m68k-checksum-__user-annotations 2006-01-04 22:24:31.000000000 -0800 +++ devel-akpm/arch/m68k/lib/checksum.c 2006-01-04 22:24:31.000000000 -0800 @@ -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) { /* diff -puN include/asm-m68k/checksum.h~m68k-checksum-__user-annotations include/asm-m68k/checksum.h --- devel/include/asm-m68k/checksum.h~m68k-checksum-__user-annotations 2006-01-04 22:24:31.000000000 -0800 +++ devel-akpm/include/asm-m68k/checksum.h 2006-01-04 22:24:31.000000000 -0800 @@ -25,7 +25,7 @@ unsigned int csum_partial(const unsigned * better 64-bit) boundary */ -extern unsigned int csum_partial_copy_from_user(const unsigned char *src, +extern unsigned int csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst, int len, int sum, int *csum_err); _