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]
/
include
/
asm-sparc
/
checksum.h
diff --git
a/include/asm-sparc/checksum.h
b/include/asm-sparc/checksum.h
index
60c5633
..
2861581
100644
(file)
--- a/
include/asm-sparc/checksum.h
+++ b/
include/asm-sparc/checksum.h
@@
-39,10
+39,10
@@
extern unsigned int csum_partial(const unsigned char * buff, int len, unsigned i
* better 64-bit) boundary
*/
* better 64-bit) boundary
*/
-extern unsigned int __csum_partial_copy_sparc_generic (const
char *,
char *);
+extern unsigned int __csum_partial_copy_sparc_generic (const
unsigned char *, unsigned
char *);
static inline unsigned int
static inline unsigned int
-csum_partial_copy_nocheck (const
char *src, char *dst, int len,
+csum_partial_copy_nocheck (const
unsigned char *src, unsigned char *dst, int len,
unsigned int sum)
{
register unsigned int ret asm("o0") = (unsigned int)src;
unsigned int sum)
{
register unsigned int ret asm("o0") = (unsigned int)src;
@@
-61,7
+61,7
@@
csum_partial_copy_nocheck (const char *src, char *dst, int len,
}
static inline unsigned int
}
static inline unsigned int
-csum_partial_copy_from_user(const
char *src, char *dst, int len,
+csum_partial_copy_from_user(const
unsigned char __user *src, unsigned char *dst, int len,
unsigned int sum, int *err)
{
if (!access_ok (VERIFY_READ, src, len)) {
unsigned int sum, int *err)
{
if (!access_ok (VERIFY_READ, src, len)) {
@@
-69,7
+69,7
@@
csum_partial_copy_from_user(const char *src, char *dst, int len,
memset (dst, 0, len);
return sum;
} else {
memset (dst, 0, len);
return sum;
} else {
- register unsigned
int ret asm("o0") = (unsigned int
)src;
+ register unsigned
long ret asm("o0") = (unsigned long
)src;
register char *d asm("o1") = dst;
register int l asm("g1") = len;
register unsigned int s asm("g7") = sum;
register char *d asm("o1") = dst;
register int l asm("g1") = len;
register unsigned int s asm("g7") = sum;
@@
-91,15
+91,15
@@
csum_partial_copy_from_user(const char *src, char *dst, int len,
}
static inline unsigned int
}
static inline unsigned int
-csum_partial_copy_to_user(const
char *src, char __user *dst, int len,
+csum_partial_copy_to_user(const
unsigned char *src, unsigned char __user *dst, int len,
unsigned int sum, int *err)
{
if (!access_ok (VERIFY_WRITE, dst, len)) {
*err = -EFAULT;
return sum;
} else {
unsigned int sum, int *err)
{
if (!access_ok (VERIFY_WRITE, dst, len)) {
*err = -EFAULT;
return sum;
} else {
- register unsigned
int ret asm("o0") = (unsigned int
)src;
- register char *d asm("o1") = dst;
+ register unsigned
long ret asm("o0") = (unsigned long
)src;
+ register char
__user
*d asm("o1") = dst;
register int l asm("g1") = len;
register unsigned int s asm("g7") = sum;
register int l asm("g1") = len;
register unsigned int s asm("g7") = sum;