git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
um
/
kernel
/
checksum.c
diff --git
a/arch/um/kernel/checksum.c
b/arch/um/kernel/checksum.c
index
fa50a9b
..
b2fe269
100644
(file)
--- a/
arch/um/kernel/checksum.c
+++ b/
arch/um/kernel/checksum.c
@@
-2,17
+2,17
@@
#include "linux/errno.h"
#include "linux/module.h"
#include "linux/errno.h"
#include "linux/module.h"
-
extern unsigned int arch_csum_partial(const
char *buff, int len, int sum);
+
unsigned int arch_csum_partial(const unsigned
char *buff, int len, int sum);
-
extern unsigned int csum_partial(
char *buff, int len, int sum)
+
unsigned int csum_partial(unsigned
char *buff, int len, int sum)
{
{
- return
(arch_csum_partial(buff, len, sum)
);
+ return
arch_csum_partial(buff, len, sum
);
}
EXPORT_SYMBOL(csum_partial);
}
EXPORT_SYMBOL(csum_partial);
-unsigned int csum_partial_copy_to(const
char *src, char *dst, int len,
-
int sum, int *err_ptr)
+unsigned int csum_partial_copy_to(const
unsigned char *src, char __user *dst,
+
int len,
int sum, int *err_ptr)
{
if(copy_to_user(dst, src, len)){
*err_ptr = -EFAULT;
{
if(copy_to_user(dst, src, len)){
*err_ptr = -EFAULT;
@@
-22,15
+22,15
@@
unsigned int csum_partial_copy_to(const char *src, char *dst, int len,
return(arch_csum_partial(src, len, sum));
}
return(arch_csum_partial(src, len, sum));
}
-unsigned int csum_partial_copy_from(const
char *src, char *dst, int len,
-
int sum, int *err_ptr)
+unsigned int csum_partial_copy_from(const
unsigned char __user *src, char *dst,
+
int len,
int sum, int *err_ptr)
{
if(copy_from_user(dst, src, len)){
*err_ptr = -EFAULT;
return(-1);
}
{
if(copy_from_user(dst, src, len)){
*err_ptr = -EFAULT;
return(-1);
}
- return
(arch_csum_partial(dst, len, sum)
);
+ return
arch_csum_partial(dst, len, sum
);
}
/*
}
/*