Skip to contentSkip to conversation

v850: Update checksum.h to match changed function signatures

PATCH In review Miles Bader 3 participants 3 messages Jul 11, 2005

lore
Share & tools
lore

Miles Bader

author
#0 lore raw

PATCH 1/1 v850: Update checksum.h to match changed function signatures

Signed-off-by Miles Bader <[email protected]>
 arch/v850/lib/checksum.c    |    3 ++-
 include/asm-v850/checksum.h |   11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)
arch/v850/lib/checksum.c +2 -1
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
@@ -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)
 {
include/asm-v850/checksum.h +6 -5
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
@@ -1,8 +1,8 @@
 /*
  * include/asm-v850/checksum.h -- Checksum ops
  *
- *  Copyright (C) 2001  NEC Corporation
- *  Copyright (C) 2001  Miles Bader <[email protected]>
+ *  Copyright (C) 2001,2005  NEC Corporation
+ *  Copyright (C) 2001,2005  Miles Bader <[email protected]>
  *
  * 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);
#1 lore raw

Le 11/07/05 18:24 +0900, Miles Bader écrivit:

arch/v850/lib/checksum.c line 142

Quoted 4 lines
arch/v850/lib/checksum.c +2 -1
-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

Quoted 2 lines

int len, unsigned int sum, int *err_ptr)

Regards,
Frederik Deweerdt

#2 lore raw

2005/7/11, Frederik Deweerdt <[email protected]>:

Quoted 4 lines

arch/v850/lib/checksum.c line 142

Quoted 3 lines
arch/v850/lib/checksum.c +2 -1
-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

Signature · 1 line
Do not taunt Happy Fun Ball.