Merge with Linux 2.3.43.

9 files changed, 13 insertions, 13 deletions

diff --git a/include/asm-sparc64/checksum.h b/include/asm-sparc64/checksum.h
index b2c06823a..11748508e 100644
--- a/include/asm-sparc64/checksum.h
+++ b/include/asm-sparc64/checksum.h
@@ -1,4 +1,4 @@
-/* $Id: checksum.h,v 1.15 2000/01/19 04:06:09 davem Exp $ */
+/* $Id: checksum.h,v 1.16 2000/01/31 01:26:54 davem Exp $ */
 #ifndef __SPARC64_CHECKSUM_H
 #define __SPARC64_CHECKSUM_H
 
@@ -167,7 +167,7 @@ static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
 
 static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
 						     struct in6_addr *daddr,
-						     __u16 len,
+						     __u32 len,
 						     unsigned short proto,
 						     unsigned int sum) 
 {
@@ -192,7 +192,7 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
 	addccc		%%g3, %%g7, %0
 	addc		0, %0, %0
 "	: "=&r" (sum)
-	: "r" (saddr), "r" (daddr), "r"(htonl((__u32) (len))),
+	: "r" (saddr), "r" (daddr), "r"(htonl(len)),
 	  "r"(htonl(proto)), "r"(sum)
 	: "g2", "g3", "g7", "cc");
 
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h
index 4f0b0baf2..fce01fcd2 100644
--- a/include/asm-sparc64/dma.h
+++ b/include/asm-sparc64/dma.h
@@ -1,4 +1,4 @@
-/* $Id: dma.h,v 1.18 1999/12/01 10:47:22 davem Exp $
+/* $Id: dma.h,v 1.19 2000/01/28 13:43:14 jj Exp $
  * include/asm-sparc64/dma.h
  *
  * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
diff --git a/include/asm-sparc64/ethtool.h b/include/asm-sparc64/ethtool.h
index b070ea1a4..18d86c3de 100644
--- a/include/asm-sparc64/ethtool.h
+++ b/include/asm-sparc64/ethtool.h
@@ -1,7 +1,7 @@
-/* $Id: ethtool.h,v 1.1 1998/12/19 15:09:40 davem Exp $
+/* $Id: ethtool.h,v 1.2 2000/01/31 04:59:19 davem Exp $
  * ethtool.h: Defines for SparcLinux ethtool.
  *
- * Copyright (C) 1998 David S. Miller (davem@dm.cobaltmicro.com)
+ * Copyright (C) 1998 David S. Miller (davem@redhat.com)
  */
 
 #ifndef _SPARC64_ETHTOOL_H
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
index 3758686e2..fb65d46dc 100644
--- a/include/asm-sparc64/floppy.h
+++ b/include/asm-sparc64/floppy.h
@@ -1,4 +1,4 @@
-/* $Id: floppy.h,v 1.24 2000/01/09 15:16:34 ecd Exp $
+/* $Id: floppy.h,v 1.25 2000/01/28 13:43:14 jj Exp $
  * asm-sparc64/floppy.h: Sparc specific parts of the Floppy driver.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h
index 37a1e847b..cb7fba53f 100644
--- a/include/asm-sparc64/io.h
+++ b/include/asm-sparc64/io.h
@@ -1,4 +1,4 @@
-/* $Id: io.h,v 1.29 1999/12/20 04:58:42 davem Exp $ */
+/* $Id: io.h,v 1.30 2000/01/28 13:43:14 jj Exp $ */
 #ifndef __SPARC64_IO_H
 #define __SPARC64_IO_H
 
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index 5184ba51a..259c755d5 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -1,4 +1,4 @@
-/* $Id: parport.h,v 1.6 2000/01/09 15:16:34 ecd Exp $
+/* $Id: parport.h,v 1.7 2000/01/28 13:43:14 jj Exp $
  * parport.h: sparc64 specific parport initialization and dma.
  *
  * Copyright (C) 1999  Eddie C. Dost  (ecd@skynet.be)
diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h
index 1b0b5137a..f8c5e247f 100644
--- a/include/asm-sparc64/sbus.h
+++ b/include/asm-sparc64/sbus.h
@@ -1,4 +1,4 @@
-/* $Id: sbus.h,v 1.12 1999/12/20 14:08:25 jj Exp $
+/* $Id: sbus.h,v 1.13 2000/01/28 13:43:14 jj Exp $
  * sbus.h: Defines for the Sun SBus.
  *
  * Copyright (C) 1996, 1999 David S. Miller (davem@redhat.com)
diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h
index f8e42235c..b1ccfc523 100644
--- a/include/asm-sparc64/types.h
+++ b/include/asm-sparc64/types.h
@@ -1,4 +1,4 @@
-/* $Id: types.h,v 1.2 1997/12/22 13:28:33 mj Exp $ */
+/* $Id: types.h,v 1.3 2000/01/28 13:43:15 jj Exp $ */
 #ifndef _SPARC64_TYPES_H
 #define _SPARC64_TYPES_H
 
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index d1c874480..abf6c09eb 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -1,4 +1,4 @@
-/* $Id: unistd.h,v 1.40 2000/01/16 06:20:38 davem Exp $ */
+/* $Id: unistd.h,v 1.42 2000/01/29 17:57:26 jj Exp $ */
 #ifndef _SPARC64_UNISTD_H
 #define _SPARC64_UNISTD_H
 
@@ -161,7 +161,7 @@
 /* #define __NR_ni_syscall      143    ENOSYS under SunOS                          */
 #define __NR_getrlimit		144 /* Common                                      */
 #define __NR_setrlimit          145 /* Common                                      */
-/* #define __NR_killpg          146    SunOS Specific                              */
+#define __NR_pivot_root		146 /* Linux Specific, killpg under SunOS          */
 #define __NR_prctl		147 /* ENOSYS under SunOS                          */
 #define __NR_pciconfig_read	148 /* ENOSYS under SunOS                          */
 #define __NR_pciconfig_write	149 /* ENOSYS under SunOS                          */