Merge with 2.3.99-pre9.

8 files changed, 13 insertions, 10 deletions

diff --git a/include/asm-sparc64/delay.h b/include/asm-sparc64/delay.h
index 4a9bfdb1c..1dc636453 100644
--- a/include/asm-sparc64/delay.h
+++ b/include/asm-sparc64/delay.h
@@ -1,4 +1,4 @@
-/* $Id: delay.h,v 1.8 2000/04/13 04:45:59 davem Exp $
+/* $Id: delay.h,v 1.9 2000/05/09 17:40:15 davem Exp $
  * delay.h: Linux delay routines on the V9.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu).
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
index 385baa7a4..471ee71a0 100644
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -1,4 +1,4 @@
-/* $Id: ide.h,v 1.17 1999/12/15 22:18:49 davem Exp $
+/* $Id: ide.h,v 1.18 2000/05/22 07:29:43 davem Exp $
  * ide.h: Ultra/PCI specific IDE glue.
  *
  * Copyright (C) 1997  David S. Miller (davem@caip.rutgers.edu)
@@ -59,7 +59,8 @@ static __inline__ void ide_init_default_hwifs(void)
 	int index;
 
 	for (index = 0; index < MAX_HWIFS; index++) {
-		ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, 0);
+		memset(&hw, 0, sizeof(hw_regs_t));
+		ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
 		hw.irq = ide_default_irq(ide_default_io_base(index));
 		ide_register_hw(&hw, NULL);
 	}
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index cff5236ed..111ad568b 100644
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -1,4 +1,4 @@
-/* $Id: irq.h,v 1.17 1999/09/21 14:39:41 davem Exp $
+/* $Id: irq.h,v 1.18 2000/05/09 17:40:15 davem Exp $
  * irq.h: IRQ registers on the 64-bit Sparc.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h
index 963ce73e4..cf6cbc589 100644
--- a/include/asm-sparc64/oplib.h
+++ b/include/asm-sparc64/oplib.h
@@ -1,4 +1,4 @@
-/* $Id: oplib.h,v 1.12 1999/11/19 05:53:12 davem Exp $
+/* $Id: oplib.h,v 1.13 2000/05/09 17:40:15 davem Exp $
  * oplib.h:  Describes the interface and available routines in the
  *           Linux Prom library.
  *
diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h
index b731a18aa..b7b124a56 100644
--- a/include/asm-sparc64/processor.h
+++ b/include/asm-sparc64/processor.h
@@ -1,4 +1,4 @@
-/* $Id: processor.h,v 1.63 2000/03/27 10:38:57 davem Exp $
+/* $Id: processor.h,v 1.64 2000/05/09 17:40:15 davem Exp $
  * include/asm-sparc64/processor.h
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
index 895cd74df..00303c239 100644
--- a/include/asm-sparc64/system.h
+++ b/include/asm-sparc64/system.h
@@ -1,4 +1,4 @@
-/* $Id: system.h,v 1.58 2000/05/05 18:47:41 davem Exp $ */
+/* $Id: system.h,v 1.59 2000/05/09 17:40:15 davem Exp $ */
 #ifndef __SPARC64_SYSTEM_H
 #define __SPARC64_SYSTEM_H
 
diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h
index 8eb30d7d8..4aa85bede 100644
--- a/include/asm-sparc64/timer.h
+++ b/include/asm-sparc64/timer.h
@@ -1,4 +1,4 @@
-/* $Id: timer.h,v 1.2 1998/03/15 17:23:52 ecd Exp $
+/* $Id: timer.h,v 1.3 2000/05/09 17:40:15 davem Exp $
  * timer.h: System timer definitions for sun5.
  *
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index abf6c09eb..c7fd4cd19 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -1,4 +1,4 @@
-/* $Id: unistd.h,v 1.42 2000/01/29 17:57:26 jj Exp $ */
+/* $Id: unistd.h,v 1.44 2000/05/16 16:42:33 jj Exp $ */
 #ifndef _SPARC64_UNISTD_H
 #define _SPARC64_UNISTD_H
 
@@ -246,7 +246,9 @@
 #define __NR_setfsuid           228 /* Linux Specific                              */
 #define __NR_setfsgid           229 /* Linux Specific                              */
 #define __NR__newselect         230 /* Linux Specific                              */
-#define __NR_time               231 /* Linux Specific                              */
+#ifdef __KERNEL__
+#define __NR_time		231 /* Linux sparc32                               */
+#endif
 /* #define __NR_oldstat         232    Linux Specific                              */
 #define __NR_stime              233 /* Linux Specific                              */
 /* #define __NR_oldfstat        234    Linux Specific                              */