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
/
ia64
/
lib
/
csum_partial_copy.c
diff --git
a/arch/ia64/lib/csum_partial_copy.c
b/arch/ia64/lib/csum_partial_copy.c
index
269dcc2
..
36866e8
100644
(file)
--- a/
arch/ia64/lib/csum_partial_copy.c
+++ b/
arch/ia64/lib/csum_partial_copy.c
@@
-1,7
+1,7
@@
/*
* Network Checksum & Copy routine
*
/*
* Network Checksum & Copy routine
*
- * Copyright (C) 1999, 2003 Hewlett-Packard Co
+ * Copyright (C) 1999, 2003
-2004
Hewlett-Packard Co
* Stephane Eranian <eranian@hpl.hp.com>
*
* Most of the code has been imported from Linux/Alpha
* Stephane Eranian <eranian@hpl.hp.com>
*
* Most of the code has been imported from Linux/Alpha
@@
-105,8
+105,8
@@
out:
extern unsigned long do_csum(const unsigned char *, long);
static unsigned int
extern unsigned long do_csum(const unsigned char *, long);
static unsigned int
-do_csum_partial_copy_from_user (const
char *src, char *dst, int len
,
- unsigned int psum, int *errp)
+do_csum_partial_copy_from_user (const
unsigned char __user *src, unsigned char *dst
,
+
int len,
unsigned int psum, int *errp)
{
unsigned long result;
{
unsigned long result;
@@
-129,10
+129,10
@@
do_csum_partial_copy_from_user (const char *src, char *dst, int len,
}
unsigned int
}
unsigned int
-csum_partial_copy_from_user
(const char *src, char *dst, int len
,
- unsigned int sum, int *errp)
+csum_partial_copy_from_user
(const unsigned char __user *src, unsigned char *dst
,
+
int len,
unsigned int sum, int *errp)
{
{
- if (!access_ok(
src, len, VERIFY_READ
)) {
+ if (!access_ok(
VERIFY_READ, src, len
)) {
*errp = -EFAULT;
memset(dst, 0, len);
return sum;
*errp = -EFAULT;
memset(dst, 0, len);
return sum;
@@
-142,7
+142,8
@@
csum_partial_copy_from_user(const char *src, char *dst, int len,
}
unsigned int
}
unsigned int
-csum_partial_copy_nocheck(const char *src, char *dst, int len, unsigned int sum)
+csum_partial_copy_nocheck(const unsigned char __user *src, unsigned char *dst,
+ int len, unsigned int sum)
{
return do_csum_partial_copy_from_user(src, dst, len, sum, NULL);
}
{
return do_csum_partial_copy_from_user(src, dst, len, sum, NULL);
}