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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-arm
/
checksum.h
diff --git
a/include/asm-arm/checksum.h
b/include/asm-arm/checksum.h
index
f82f595
..
747bdd3
100644
(file)
--- a/
include/asm-arm/checksum.h
+++ b/
include/asm-arm/checksum.h
@@
-37,7
+37,7
@@
unsigned int
csum_partial_copy_nocheck(const char *src, char *dst, int len, int sum);
unsigned int
csum_partial_copy_nocheck(const char *src, char *dst, int len, int sum);
unsigned int
-csum_partial_copy_from_user(const char *src, char *dst, int len, int sum, int *err_ptr);
+csum_partial_copy_from_user(const char
__user
*src, char *dst, int len, int sum, int *err_ptr);
/*
* This is the old (and unsafe) way of doing checksums, a warning message will
/*
* This is the old (and unsafe) way of doing checksums, a warning message will
@@
-77,7
+77,7
@@
ip_fast_csum(unsigned char * iph, unsigned int ihl)
mov %0, %0, lsr #16"
: "=r" (sum), "=r" (iph), "=r" (ihl), "=r" (tmp1)
: "1" (iph), "2" (ihl)
mov %0, %0, lsr #16"
: "=r" (sum), "=r" (iph), "=r" (ihl), "=r" (tmp1)
: "1" (iph), "2" (ihl)
- : "cc");
+ : "cc"
, "memory"
);
return sum;
}
return sum;
}