diff options
author | Dave Jones <davej@redhat.com> | 2006-04-18 17:19:55 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-04-18 17:19:55 -0500 |
commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /arch/um/include/sysdep-i386/checksum.h | |
parent | [CPUFREQ] x86_64: Proper null pointer check in powernow_k8_get (diff) | |
parent | x86: be careful about tailcall breakage for sys_open[at] too (diff) | |
download | linux-dev-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.tar.xz linux-dev-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.zip |
Merge ../linus
Diffstat (limited to 'arch/um/include/sysdep-i386/checksum.h')
-rw-r--r-- | arch/um/include/sysdep-i386/checksum.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/um/include/sysdep-i386/checksum.h b/arch/um/include/sysdep-i386/checksum.h index 7d3d202d7fff..052bb061a978 100644 --- a/arch/um/include/sysdep-i386/checksum.h +++ b/arch/um/include/sysdep-i386/checksum.h @@ -48,7 +48,8 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char * */ static __inline__ -unsigned int csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, +unsigned int csum_partial_copy_from_user(const unsigned char __user *src, + unsigned char *dst, int len, int sum, int *err_ptr) { if(copy_from_user(dst, src, len)){ @@ -192,7 +193,7 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr, */ #define HAVE_CSUM_COPY_USER static __inline__ unsigned int csum_and_copy_to_user(const unsigned char *src, - unsigned char *dst, + unsigned char __user *dst, int len, int sum, int *err_ptr) { if (access_ok(VERIFY_WRITE, dst, len)){ |