diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/lib/checksum.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c index cb13c6e3ccae..aed3be29e06b 100644 --- a/arch/m68k/lib/checksum.c +++ b/arch/m68k/lib/checksum.c | |||
@@ -39,8 +39,7 @@ | |||
39 | * computes a partial checksum, e.g. for TCP/UDP fragments | 39 | * computes a partial checksum, e.g. for TCP/UDP fragments |
40 | */ | 40 | */ |
41 | 41 | ||
42 | unsigned int | 42 | __wsum csum_partial(const void *buff, int len, __wsum sum) |
43 | csum_partial (const unsigned char *buff, int len, unsigned int sum) | ||
44 | { | 43 | { |
45 | unsigned long tmp1, tmp2; | 44 | unsigned long tmp1, tmp2; |
46 | /* | 45 | /* |
@@ -133,9 +132,9 @@ EXPORT_SYMBOL(csum_partial); | |||
133 | * copy from user space while checksumming, with exception handling. | 132 | * copy from user space while checksumming, with exception handling. |
134 | */ | 133 | */ |
135 | 134 | ||
136 | unsigned int | 135 | __wsum |
137 | csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst, | 136 | csum_partial_copy_from_user(const void __user *src, void *dst, |
138 | int len, int sum, int *csum_err) | 137 | int len, __wsum sum, int *csum_err) |
139 | { | 138 | { |
140 | /* | 139 | /* |
141 | * GCC doesn't like more than 10 operands for the asm | 140 | * GCC doesn't like more than 10 operands for the asm |
@@ -325,8 +324,8 @@ csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst, | |||
325 | * copy from kernel space while checksumming, otherwise like csum_partial | 324 | * copy from kernel space while checksumming, otherwise like csum_partial |
326 | */ | 325 | */ |
327 | 326 | ||
328 | unsigned int | 327 | __wsum |
329 | csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, int len, int sum) | 328 | csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) |
330 | { | 329 | { |
331 | unsigned long tmp1, tmp2; | 330 | unsigned long tmp1, tmp2; |
332 | __asm__("movel %2,%4\n\t" | 331 | __asm__("movel %2,%4\n\t" |