diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 01:06:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 09:09:03 -0800 |
| commit | 6225d85f171f8b7a776850d30352bd196f9bd0d6 (patch) | |
| tree | 3a3139d1428a78152b383509aaebc04d0a45904e | |
| parent | 350c20a6fd24b2a3265f7ca440aa17570e89e2cd (diff) | |
| download | kernel_samsung_crespo-6225d85f171f8b7a776850d30352bd196f9bd0d6.zip kernel_samsung_crespo-6225d85f171f8b7a776850d30352bd196f9bd0d6.tar.gz kernel_samsung_crespo-6225d85f171f8b7a776850d30352bd196f9bd0d6.tar.bz2 | |
[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.c | 2 | ||||
| -rw-r--r-- | include/asm-m68k/checksum.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c index 4a5c544..cb13c6e 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) { /* diff --git a/include/asm-m68k/checksum.h b/include/asm-m68k/checksum.h index 78860c2..17280ef 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) * 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); |