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

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

[Miles Bader]

Signed-off-by: Miles Bader <miles@gnu.org>

 arch/v850/lib/checksum.c    |    3 ++-
 include/asm-v850/checksum.h |   11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff -ruN -X../cludes linux-2.6.11-uc0/arch/v850/lib/checksum.c linux-2.6.11-uc0-v850-20050711/arch/v850/lib/checksum.c
--- linux-2.6.11-uc0/arch/v850/lib/checksum.c	2005-03-04 11:31:28.747099000 +0900
+++ linux-2.6.11-uc0-v850-20050711/arch/v850/lib/checksum.c	2005-07-11 13:05:36.844263000 +0900
@@ -138,7 +138,8 @@
  * 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)
 {
diff -ruN -X../cludes linux-2.6.11-uc0/include/asm-v850/checksum.h linux-2.6.11-uc0-v850-20050711/include/asm-v850/checksum.h
--- linux-2.6.11-uc0/include/asm-v850/checksum.h	2002-11-05 11:25:31.859782000 +0900
+++ linux-2.6.11-uc0-v850-20050711/include/asm-v850/checksum.h	2005-07-11 13:06:31.973753000 +0900
@@ -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
@@ -36,8 +36,8 @@
  * 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);
 
 
 /*
@@ -46,7 +46,8 @@
  * 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);
 

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

[Frederik Deweerdt]

Le 11/07/05 18:24 +0900, Miles Bader écrivit:
> 
> -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,
					  ^^^^^^^ Alignment looks fuzzy here
>                                            int len, unsigned int sum,
>                                            int *err_ptr)

Regards,
Frederik Deweerdt

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

[Miles Bader]

2005/7/11, Frederik Deweerdt <frederik.deweerdt@gmail.com>:
> > -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,
>                                           ^^^^^^^ Alignment looks fuzzy here

It's actually a spaces-vs-tabs issue -- the existing lines use all
spaces for indentation, but my new line uses tabs, so when viewed as
part of the diff they look unaligned; they look OK in the actual
source file though.

-Miles
-- 
Do not taunt Happy Fun Ball.