diff options
-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 d308b724c023..fa5872633075 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, | |||
138 | * Copy from userspace and compute checksum. If we catch an exception | 138 | * Copy from userspace and compute checksum. If we catch an exception |
139 | * then zero the rest of the buffer. | 139 | * then zero the rest of the buffer. |
140 | */ | 140 | */ |
141 | unsigned int csum_partial_copy_from_user (const unsigned char *src, unsigned char *dst, | 141 | unsigned int csum_partial_copy_from_user (const unsigned char *src, |
142 | unsigned char *dst, | ||
142 | int len, unsigned int sum, | 143 | int len, unsigned int sum, |
143 | int *err_ptr) | 144 | int *err_ptr) |
144 | { | 145 | { |
diff --git a/include/asm-v850/checksum.h b/include/asm-v850/checksum.h index d3aedb7bfc5c..4df5e71098f9 100644 --- a/include/asm-v850/checksum.h +++ b/include/asm-v850/checksum.h | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-v850/checksum.h -- Checksum ops | 2 | * include/asm-v850/checksum.h -- Checksum ops |
3 | * | 3 | * |
4 | * Copyright (C) 2001 NEC Corporation | 4 | * Copyright (C) 2001,2005 NEC Corporation |
5 | * Copyright (C) 2001 Miles Bader <miles@gnu.org> | 5 | * Copyright (C) 2001,2005 Miles Bader <miles@gnu.org> |
6 | * | 6 | * |
7 | * This file is subject to the terms and conditions of the GNU General | 7 | * This file is subject to the terms and conditions of the GNU General |
8 | * Public License. See the file COPYING in the main directory of this | 8 | * 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, | |||
36 | * here even more important to align src and dst on a 32-bit (or even | 36 | * here even more important to align src and dst on a 32-bit (or even |
37 | * better 64-bit) boundary | 37 | * better 64-bit) boundary |
38 | */ | 38 | */ |
39 | extern unsigned csum_partial_copy (const char *src, char *dst, int len, | 39 | extern unsigned csum_partial_copy (const unsigned char *src, |
40 | unsigned sum); | 40 | unsigned char *dst, int len, unsigned sum); |
41 | 41 | ||
42 | 42 | ||
43 | /* | 43 | /* |
@@ -46,7 +46,8 @@ extern unsigned csum_partial_copy (const char *src, char *dst, int len, | |||
46 | * here even more important to align src and dst on a 32-bit (or even | 46 | * here even more important to align src and dst on a 32-bit (or even |
47 | * better 64-bit) boundary | 47 | * better 64-bit) boundary |
48 | */ | 48 | */ |
49 | extern unsigned csum_partial_copy_from_user (const char *src, char *dst, | 49 | extern unsigned csum_partial_copy_from_user (const unsigned char *src, |
50 | unsigned char *dst, | ||
50 | int len, unsigned sum, | 51 | int len, unsigned sum, |
51 | int *csum_err); | 52 | int *csum_err); |
52 | 53 | ||