Commit 623cdf4a authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds

[PATCH] v850: Update checksum.h to match changed function signatures

Signed-off-by: default avatarMiles Bader <miles@gnu.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 200d481f
...@@ -138,7 +138,8 @@ unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, ...@@ -138,7 +138,8 @@ unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst,
* Copy from userspace and compute checksum. If we catch an exception * Copy from userspace and compute checksum. If we catch an exception
* then zero the rest of the buffer. * then zero the rest of the buffer.
*/ */
unsigned int csum_partial_copy_from_user (const unsigned char *src, unsigned char *dst, unsigned int csum_partial_copy_from_user (const unsigned char *src,
unsigned char *dst,
int len, unsigned int sum, int len, unsigned int sum,
int *err_ptr) int *err_ptr)
{ {
......
/* /*
* include/asm-v850/checksum.h -- Checksum ops * include/asm-v850/checksum.h -- Checksum ops
* *
* Copyright (C) 2001 NEC Corporation * Copyright (C) 2001,2005 NEC Corporation
* Copyright (C) 2001 Miles Bader <miles@gnu.org> * Copyright (C) 2001,2005 Miles Bader <miles@gnu.org>
* *
* This file is subject to the terms and conditions of the GNU General * This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this * Public License. See the file COPYING in the main directory of this
...@@ -36,8 +36,8 @@ extern unsigned int csum_partial (const unsigned char * buff, int len, ...@@ -36,8 +36,8 @@ extern unsigned int csum_partial (const unsigned char * buff, int len,
* here even more important to align src and dst on a 32-bit (or even * here even more important to align src and dst on a 32-bit (or even
* better 64-bit) boundary * better 64-bit) boundary
*/ */
extern unsigned csum_partial_copy (const char *src, char *dst, int len, extern unsigned csum_partial_copy (const unsigned char *src,
unsigned sum); unsigned char *dst, int len, unsigned sum);
/* /*
...@@ -46,7 +46,8 @@ extern unsigned csum_partial_copy (const char *src, char *dst, int len, ...@@ -46,7 +46,8 @@ extern unsigned csum_partial_copy (const char *src, char *dst, int len,
* here even more important to align src and dst on a 32-bit (or even * here even more important to align src and dst on a 32-bit (or even
* better 64-bit) boundary * better 64-bit) boundary
*/ */
extern unsigned csum_partial_copy_from_user (const char *src, char *dst, extern unsigned csum_partial_copy_from_user (const unsigned char *src,
unsigned char *dst,
int len, unsigned sum, int len, unsigned sum,
int *csum_err); int *csum_err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment