Merge with 2.3.19.

9 files changed, 23 insertions, 23 deletions

diff --git a/arch/mips/sgi/kernel/indy_hpc.c b/arch/mips/sgi/kernel/indy_hpc.c
index c8f923c47..2287bdde8 100644
--- a/arch/mips/sgi/kernel/indy_hpc.c
+++ b/arch/mips/sgi/kernel/indy_hpc.c
@@ -1,4 +1,4 @@
-/* $Id: indy_hpc.c,v 1.5 1998/08/25 09:14:48 ralf Exp $
+/* $Id: indy_hpc.c,v 1.6 1999/05/07 22:34:31 ulfc Exp $
  *
  * indy_hpc.c: Routines for generic manipulation of the HPC controllers.
  *
@@ -25,7 +25,7 @@ int sgi_has_ioc2 = 0;
 int sgi_guiness = 0;
 int sgi_boardid;
 
-__initfunc(void sgihpc_init(void))
+void __init sgihpc_init(void)
 {
 	unsigned long sid, crev, brev;
 
diff --git a/arch/mips/sgi/kernel/indy_int.c b/arch/mips/sgi/kernel/indy_int.c
index b29ff58c9..60ce3e0f1 100644
--- a/arch/mips/sgi/kernel/indy_int.c
+++ b/arch/mips/sgi/kernel/indy_int.c
@@ -1,4 +1,4 @@
-/* $Id: indy_int.c,v 1.12 1999/05/07 22:34:32 ulfc Exp $
+/* $Id: indy_int.c,v 1.13 1999/06/12 17:26:15 ulfc Exp $
  *
  * indy_int.c: Routines for generic manipulation of the INT[23] ASIC
  *             found on INDY workstations..
@@ -424,7 +424,7 @@ static int indy_irq_cannonicalize(int irq)
 	return irq;	/* Sane hardware, sane code ... */
 }
 
-__initfunc(void init_IRQ(void))
+void __init init_IRQ(void)
 {
 	irq_cannonicalize = indy_irq_cannonicalize;
 	irq_setup();
@@ -529,7 +529,7 @@ int probe_irq_off (unsigned long irqs)
 	return 0;
 }
 
-__initfunc(void sgint_init(void))
+void __init sgint_init(void)
 {
 	int i;
 
diff --git a/arch/mips/sgi/kernel/indy_mc.c b/arch/mips/sgi/kernel/indy_mc.c
index 1cd05afc8..acd07cfdc 100644
--- a/arch/mips/sgi/kernel/indy_mc.c
+++ b/arch/mips/sgi/kernel/indy_mc.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes
  *
- * $Id: indy_mc.c,v 1.3 1998/05/04 09:12:57 ralf Exp $
+ * $Id: indy_mc.c,v 1.4 1999/05/07 22:34:32 ulfc Exp $
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -47,7 +47,7 @@ static inline char *mconfig_string(unsigned long val)
 	};
 }
 
-__initfunc(void sgimc_init(void))
+void __init sgimc_init(void)
 {
 	unsigned long tmpreg;
 
diff --git a/arch/mips/sgi/kernel/indy_sc.c b/arch/mips/sgi/kernel/indy_sc.c
index 1fecee23f..461691304 100644
--- a/arch/mips/sgi/kernel/indy_sc.c
+++ b/arch/mips/sgi/kernel/indy_sc.c
@@ -1,4 +1,4 @@
-/* $Id: indy_sc.c,v 1.9 1999/05/12 21:57:49 ulfc Exp $
+/* $Id: indy_sc.c,v 1.10 1999/09/28 22:25:49 ralf Exp $
  *
  * indy_sc.c: Indy cache managment functions.
  *
@@ -150,7 +150,7 @@ static void indy_sc_disable(void)
         " : "=r" (tmp1), "=r" (tmp2), "=r" (tmp3));
 }
 
-__initfunc(static inline int indy_sc_probe(void))
+static inline int __init indy_sc_probe(void)
 {
 	volatile unsigned int *cpu_control;
 	unsigned short cmd = 0xc220;
@@ -219,7 +219,7 @@ struct bcache_ops indy_sc_ops = {
 	indy_sc_wback_invalidate
 };
 
-__initfunc(void indy_sc_init(void))
+void __init indy_sc_init(void)
 {
 	if (indy_sc_probe()) {
 		indy_sc_enable();
diff --git a/arch/mips/sgi/kernel/indy_timer.c b/arch/mips/sgi/kernel/indy_timer.c
index 096069395..8a1e8d829 100644
--- a/arch/mips/sgi/kernel/indy_timer.c
+++ b/arch/mips/sgi/kernel/indy_timer.c
@@ -1,4 +1,4 @@
-/* $Id: indy_timer.c,v 1.12 1999/06/13 16:30:36 ralf Exp $
+/* $Id: indy_timer.c,v 1.13 1999/08/20 21:59:03 ralf Exp $
  *
  * indy_timer.c: Setting up the clock on the INDY 8254 controller.
  *
@@ -178,7 +178,7 @@ static inline unsigned long mktime(unsigned int year, unsigned int mon,
 	  )*60 + sec; /* finally seconds */
 }
 
-__initfunc(static unsigned long get_indy_time(void))
+static unsigned long __init get_indy_time(void)
 {
 	struct indy_clock *clock = (struct indy_clock *)INDY_CLOCK_REGS;
 	unsigned int year, mon, day, hour, min, sec;
@@ -223,7 +223,7 @@ __initfunc(static unsigned long get_indy_time(void))
 
 #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
 
-__initfunc(void indy_timer_init(void))
+void __init indy_timer_init(void)
 {
 	struct sgi_ioc_timers *p;
 	volatile unsigned char *tcwp, *tc2p;
diff --git a/arch/mips/sgi/kernel/promcon.c b/arch/mips/sgi/kernel/promcon.c
index 3870b71e8..570d27303 100644
--- a/arch/mips/sgi/kernel/promcon.c
+++ b/arch/mips/sgi/kernel/promcon.c
@@ -37,7 +37,7 @@ static int prom_console_wait_key(struct console *co)
     return prom_getchar();
 }
 
-__initfunc(static int prom_console_setup(struct console *co, char *options))
+static int __init prom_console_setup(struct console *co, char *options)
 {
     return 0;
 }
@@ -66,7 +66,7 @@ static struct console sercons =
  *    Register console.
  */
 
-__initfunc(long sgi_prom_console_init(long kmem_start, long kmem_end))
+long __init sgi_prom_console_init(long kmem_start, long kmem_end)
 {
     register_console(&sercons);
     return kmem_start;
diff --git a/arch/mips/sgi/kernel/setup.c b/arch/mips/sgi/kernel/setup.c
index 477219826..57a56a871 100644
--- a/arch/mips/sgi/kernel/setup.c
+++ b/arch/mips/sgi/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.24 1999/06/12 17:26:15 ulfc Exp $
+/* $Id: setup.c,v 1.25 1999/08/21 22:19:12 ralf Exp $
  *
  * setup.c: SGI specific setup, including init of the feature struct.
  *
@@ -118,7 +118,7 @@ struct kbd_ops sgi_kbd_ops = {
 	sgi_read_status
 };
 
-__initfunc(static void sgi_irq_setup(void))
+static void __init sgi_irq_setup(void)
 {
 	sgint_init();
 
@@ -129,7 +129,7 @@ __initfunc(static void sgi_irq_setup(void))
 #endif
 }
 
-__initfunc(void sgi_setup(void))
+void __init sgi_setup(void)
 {
 #ifdef CONFIG_SERIAL_CONSOLE
 	char *ctype;
diff --git a/arch/mips/sgi/kernel/system.c b/arch/mips/sgi/kernel/system.c
index d6b02c4c1..7f5a3130b 100644
--- a/arch/mips/sgi/kernel/system.c
+++ b/arch/mips/sgi/kernel/system.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: system.c,v 1.6 1998/10/18 13:51:49 tsbogend Exp $
+ * $Id: system.c,v 1.7 1998/10/18 22:55:34 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -35,7 +35,7 @@ static struct smatch sgi_cputable[] = {
 
 #define NUM_CPUS 9 /* for now */
 
-__initfunc(static int string_to_cpu(char *s))
+static int __init string_to_cpu(char *s)
 {
 	int i;
 
@@ -54,7 +54,7 @@ __initfunc(static int string_to_cpu(char *s))
  * We' call this early before loadmmu().  If we do the other way around
  * the firmware will crash and burn.
  */
-__initfunc(void sgi_sysinit(void))
+void __init sgi_sysinit(void)
 {
 	pcomponent *p, *toplev, *cpup = 0;
 	int cputype = -1;
diff --git a/arch/mips/sgi/kernel/time.c b/arch/mips/sgi/kernel/time.c
index 7dc5a4d53..355f1c471 100644
--- a/arch/mips/sgi/kernel/time.c
+++ b/arch/mips/sgi/kernel/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.2 1998/03/27 08:53:45 ralf Exp $
+/* $Id: time.c,v 1.2 1998/04/05 11:24:00 ralf Exp $
  * time.c: Generic SGI time_init() code, this will dispatch to the
  *         appropriate per-architecture time/counter init code.
  *
@@ -8,7 +8,7 @@
 
 extern void indy_timer_init(void);
 
-__initfunc(void time_init(void))
+void __init time_init(void)
 {
 	/* XXX assume INDY for now XXX */
 	indy_timer_init();