diff options
| author | Miles Bader <miles@gnu.org> | 2005-07-11 18:24:50 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 10:22:39 -0700 |
| commit | 623cdf4a04a9856f93e32e7716ed8196f6d5ee3b (patch) | |
| tree | 6ddd195702acecfeda6399b9fdf64880d7181e09 | |
| parent | 200d481f28be4522464bb849dd0eb5f8cb6be781 (diff) | |
| download | kernel_samsung_smdk4412-623cdf4a04a9856f93e32e7716ed8196f6d5ee3b.tar.gz kernel_samsung_smdk4412-623cdf4a04a9856f93e32e7716ed8196f6d5ee3b.tar.bz2 kernel_samsung_smdk4412-623cdf4a04a9856f93e32e7716ed8196f6d5ee3b.zip | |
[PATCH] v850: Update checksum.h to match changed function signatures
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/v850/lib/checksum.c | 3 | ||||
| -rw-r--r-- | include/asm-v850/checksum.h | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/arch/v850/lib/checksum.c b/arch/v850/lib/checksum.c index d308b724c02..fa587263307 100644 --- a/arch/v850/lib/checksum.c +++ b/arch/v850/lib/checksum.c @@ -138,7 +138,8 @@ unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, * Copy from userspace and compute checksum. If we catch an exception * then zero the rest of the buffer. */ -unsigned int csum_partial_copy_from_user (const unsigned char *src, unsigned char *dst, +unsigned int csum_partial_copy_from_user (const unsigned char *src, + unsigned char *dst, int len, unsigned int sum, int *err_ptr) { diff --git a/include/asm-v850/checksum.h b/include/asm-v850/checksum.h index d3aedb7bfc5..4df5e71098f 100644 --- a/include/asm-v850/checksum.h +++ b/include/asm-v850/checksum.h @@ -1,8 +1,8 @@ /* * include/asm-v850/checksum.h -- Checksum ops * - * Copyright (C) 2001 NEC Corporation - * Copyright (C) 2001 Miles Bader <miles@gnu.org> + * Copyright (C) 2001,2005 NEC Corporation + * Copyright (C) 2001,2005 Miles Bader <miles@gnu.org> * * This file is subject to the terms and conditions of the GNU General * Public License. See the file COPYING in the main directory of this @@ -36,8 +36,8 @@ extern unsigned int csum_partial (const unsigned char * buff, int len, * here even more important to align src and dst on a 32-bit (or even * better 64-bit) boundary */ -extern unsigned csum_partial_copy (const char *src, char *dst, int len, - unsigned sum); +extern unsigned csum_partial_copy (const unsigned char *src, + unsigned char *dst, int len, unsigned sum); /* @@ -46,7 +46,8 @@ extern unsigned csum_partial_copy (const char *src, char *dst, int len, * here even more important to align src and dst on a 32-bit (or even * better 64-bit) boundary */ -extern unsigned csum_partial_copy_from_user (const char *src, char *dst, +extern unsigned csum_partial_copy_from_user (const unsigned char *src, + unsigned char *dst, int len, unsigned sum, int *csum_err); |