Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4590
b: refs/heads/master
c: 623cdf4
h: refs/heads/master
v: v3
  • Loading branch information
Miles Bader authored and Linus Torvalds committed Jul 11, 2005
1 parent ac6b1fb commit 6535d5a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 200d481f28be4522464bb849dd0eb5f8cb6be781
refs/heads/master: 623cdf4a04a9856f93e32e7716ed8196f6d5ee3b
3 changes: 2 additions & 1 deletion trunk/arch/v850/lib/checksum.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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 *err_ptr)
{
Expand Down
11 changes: 6 additions & 5 deletions trunk/include/asm-v850/checksum.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* include/asm-v850/checksum.h -- Checksum ops
*
* Copyright (C) 2001 NEC Corporation
* Copyright (C) 2001 Miles Bader <miles@gnu.org>
* Copyright (C) 2001,2005 NEC Corporation
* Copyright (C) 2001,2005 Miles Bader <miles@gnu.org>
*
* 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
Expand Down Expand Up @@ -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
* better 64-bit) boundary
*/
extern unsigned csum_partial_copy (const char *src, char *dst, int len,
unsigned sum);
extern unsigned csum_partial_copy (const unsigned char *src,
unsigned char *dst, int len, unsigned sum);


/*
Expand All @@ -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
* 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 *csum_err);

Expand Down

0 comments on commit 6535d5a

Please sign in to comment.