Commit 3680d547 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds

[PATCH] mips: fixed conflicting types

arch/mips/lib/csum_partial_copy.c:21: error: conflicting types for `csum_partial_copy_nocheck'
include/asm/checksum.h:65: error: previous declaration of `csum_partial_copy_nocheck'
arch/mips/lib/csum_partial_copy.c:38: error: conflicting types for `csum_partial_copy_from_user'
include/asm/checksum.h:38: error: previous declaration of `csum_partial_copy_from_user'
make[1]: *** [arch/mips/lib/csum_partial_copy.o] Error 1
make: *** [arch/mips/lib] Error 2
Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e91cb3ff
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/* /*
* copy while checksumming, otherwise like csum_partial * copy while checksumming, otherwise like csum_partial
*/ */
unsigned int csum_partial_copy_nocheck(const char *src, char *dst, unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst,
int len, unsigned int sum) int len, unsigned int sum)
{ {
/* /*
...@@ -33,7 +33,7 @@ unsigned int csum_partial_copy_nocheck(const char *src, char *dst, ...@@ -33,7 +33,7 @@ unsigned int csum_partial_copy_nocheck(const char *src, char *dst,
* Copy from userspace and compute checksum. If we catch an exception * Copy from userspace and compute checksum. If we catch an exception
* then zero the rest of the buffer. * then zero the rest of the buffer.
*/ */
unsigned int csum_partial_copy_from_user (const char *src, char *dst, unsigned int csum_partial_copy_from_user (const unsigned char *src, unsigned char *dst,
int len, unsigned int sum, int *err_ptr) int len, unsigned int sum, int *err_ptr)
{ {
int missing; int missing;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment