Merge with 2.3.19.

11 files changed, 50 insertions, 50 deletions

diff --git a/arch/mips/arc/cmdline.c b/arch/mips/arc/cmdline.c
index 94f0230ec..d60ff2bab 100644
--- a/arch/mips/arc/cmdline.c
+++ b/arch/mips/arc/cmdline.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: cmdline.c,v 1.3 1998/04/05 11:24:01 ralf Exp $
+ * $Id: cmdline.c,v 1.1 1998/10/18 13:32:08 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -16,7 +16,7 @@
 
 char arcs_cmdline[CL_SIZE];
 
-__initfunc(char *prom_getcmdline(void))
+char * __init prom_getcmdline(void)
 {
 	return &(arcs_cmdline[0]);
 }
@@ -31,7 +31,7 @@ static char *ignored[] = {
 };
 #define NENTS(foo) ((sizeof((foo)) / (sizeof((foo[0])))))
 
-__initfunc(void prom_init_cmdline(void))
+void __init prom_init_cmdline(void)
 {
 	char *cp;
 	int actr, i;
diff --git a/arch/mips/arc/console.c b/arch/mips/arc/console.c
index beca1543d..4675eb4a1 100644
--- a/arch/mips/arc/console.c
+++ b/arch/mips/arc/console.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996 David S. Miller (dm@sgi.com)
  * Compability with board caches, Ulf Carlsson
  *
- * $Id: console.c,v 1.1 1998/10/18 13:32:08 tsbogend Exp $
+ * $Id: console.c,v 1.2 1999/06/12 18:42:38 ulfc Exp $
  */
 #include <linux/init.h>
 #include <asm/sgialib.h>
@@ -22,7 +22,7 @@ extern struct bcache_ops *bcops;
 #ifdef CONFIG_SGI_PROM_CONSOLE
 void prom_putchar(char c)
 #else
-__initfunc(void prom_putchar(char c))
+void __init prom_putchar(char c)
 #endif
 {
 	long cnt;
@@ -36,7 +36,7 @@ __initfunc(void prom_putchar(char c))
 #ifdef CONFIG_SGI_PROM_CONSOLE
 char prom_getchar(void)
 #else
-__initfunc(char prom_getchar(void))
+char __init prom_getchar(void)
 #endif
 {
 	long cnt;
diff --git a/arch/mips/arc/env.c b/arch/mips/arc/env.c
index 133cb8733..8132442d5 100644
--- a/arch/mips/arc/env.c
+++ b/arch/mips/arc/env.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: env.c,v 1.2 1998/04/05 11:24:01 ralf Exp $
+ * $Id: env.c,v 1.1 1998/10/18 13:32:08 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -11,12 +11,12 @@
 
 #include <asm/sgialib.h>
 
-__initfunc(char *prom_getenv(char *name))
+char * __init prom_getenv(char *name)
 {
 	return romvec->get_evar(name);
 }
 
-__initfunc(long prom_setenv(char *name, char *value))
+long __init prom_setenv(char *name, char *value)
 {
 	return romvec->set_evar(name, value);
 }
diff --git a/arch/mips/arc/file.c b/arch/mips/arc/file.c
index 93bd2570e..30be5f5d0 100644
--- a/arch/mips/arc/file.c
+++ b/arch/mips/arc/file.c
@@ -3,57 +3,57 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: file.c,v 1.2 1998/04/05 11:24:02 ralf Exp $
+ * $Id: file.c,v 1.1 1998/10/18 13:32:08 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <asm/sgialib.h>
 
-__initfunc(long prom_getvdirent(unsigned long fd, struct linux_vdirent *ent, unsigned long num, unsigned long *cnt))
+long __init prom_getvdirent(unsigned long fd, struct linux_vdirent *ent, unsigned long num, unsigned long *cnt)
 {
 	return romvec->get_vdirent(fd, ent, num, cnt);
 }
 
-__initfunc(long prom_open(char *name, enum linux_omode md, unsigned long *fd))
+long __init prom_open(char *name, enum linux_omode md, unsigned long *fd)
 {
 	return romvec->open(name, md, fd);
 }
 
-__initfunc(long prom_close(unsigned long fd))
+long __init prom_close(unsigned long fd)
 {
 	return romvec->close(fd);
 }
 
-__initfunc(long prom_read(unsigned long fd, void *buf, unsigned long num, unsigned long *cnt))
+long __init prom_read(unsigned long fd, void *buf, unsigned long num, unsigned long *cnt)
 {
 	return romvec->read(fd, buf, num, cnt);
 }
 
-__initfunc(long prom_getrstatus(unsigned long fd))
+long __init prom_getrstatus(unsigned long fd)
 {
 	return romvec->get_rstatus(fd);
 }
 
-__initfunc(long prom_write(unsigned long fd, void *buf, unsigned long num, unsigned long *cnt))
+long __init prom_write(unsigned long fd, void *buf, unsigned long num, unsigned long *cnt)
 {
 	return romvec->write(fd, buf, num, cnt);
 }
 
-__initfunc(long prom_seek(unsigned long fd, struct linux_bigint *off, enum linux_seekmode sm))
+long __init prom_seek(unsigned long fd, struct linux_bigint *off, enum linux_seekmode sm)
 {
 	return romvec->seek(fd, off, sm);
 }
 
-__initfunc(long prom_mount(char *name, enum linux_mountops op))
+long __init prom_mount(char *name, enum linux_mountops op)
 {
 	return romvec->mount(name, op);
 }
 
-__initfunc(long prom_getfinfo(unsigned long fd, struct linux_finfo *buf))
+long __init prom_getfinfo(unsigned long fd, struct linux_finfo *buf)
 {
 	return romvec->get_finfo(fd, buf);
 }
 
-__initfunc(long prom_setfinfo(unsigned long fd, unsigned long flags, unsigned long msk))
+long __init prom_setfinfo(unsigned long fd, unsigned long flags, unsigned long msk)
 {
 	return romvec->set_finfo(fd, flags, msk);
 }
diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c
index f90203826..32117b858 100644
--- a/arch/mips/arc/init.c
+++ b/arch/mips/arc/init.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: init.c,v 1.3 1999/08/20 21:59:01 ralf Exp $
  * 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 archive
  * for more details.
@@ -24,7 +24,7 @@ unsigned short prom_vers, prom_rev;
 
 extern void prom_testtree(void);
 
-__initfunc(int prom_init(int argc, char **argv, char **envp))
+int __init prom_init(int argc, char **argv, char **envp)
 {
 	struct linux_promblock *pb;
 
diff --git a/arch/mips/arc/memory.c b/arch/mips/arc/memory.c
index 6dc762272..997280075 100644
--- a/arch/mips/arc/memory.c
+++ b/arch/mips/arc/memory.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: memory.c,v 1.4 1999/03/18 23:29:19 tsbogend Exp $
+ * $Id: memory.c,v 1.5 1999/04/14 21:25:02 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -21,7 +21,7 @@
 
 /* #define DEBUG */
 
-__initfunc(struct linux_mdesc *prom_getmdesc(struct linux_mdesc *curr))
+struct linux_mdesc * __init prom_getmdesc(struct linux_mdesc *curr)
 {
 	return romvec->get_mdesc(curr);
 }
@@ -53,7 +53,7 @@ static char *arc_mtypes[8] = {
 
 static struct prom_pmemblock prom_pblocks[PROM_MAX_PMEMBLOCKS];
 
-__initfunc(struct prom_pmemblock *prom_getpblock_array(void))
+struct prom_pmemblock * __init prom_getpblock_array(void)
 {
 	return &prom_pblocks[0];
 }
@@ -90,7 +90,7 @@ static int __init prom_memtype_classify (union linux_memtypes type)
     }
 }
 
-__initfunc(static void prom_setup_memupper(void))
+static void __init prom_setup_memupper(void)
 {
 	struct prom_pmemblock *p, *highest;
 
@@ -107,7 +107,7 @@ __initfunc(static void prom_setup_memupper(void))
 #endif
 }
 
-__initfunc(void prom_meminit(void))
+void __init prom_meminit(void)
 {
 	struct linux_mdesc *p;
 	int totram;
@@ -163,7 +163,7 @@ __initfunc(void prom_meminit(void))
 }
 
 /* Called from mem_init() to fixup the mem_map page settings. */
-__initfunc(void prom_fixup_mem_map(unsigned long start, unsigned long end))
+void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
 {
 	struct prom_pmemblock *p;
 	int i, nents;
diff --git a/arch/mips/arc/misc.c b/arch/mips/arc/misc.c
index ab50caf1e..4c056be43 100644
--- a/arch/mips/arc/misc.c
+++ b/arch/mips/arc/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.5 1998/08/25 09:14:50 ralf Exp $
+/* $Id: misc.c,v 1.1 1998/10/18 13:32:09 tsbogend Exp $
  *
  * misc.c: Miscellaneous ARCS PROM routines.
  *
@@ -78,7 +78,7 @@ struct linux_sysid *prom_getsysid(void)
 	return romvec->get_sysid();
 }
 
-__initfunc(void prom_cacheflush(void))
+void __init prom_cacheflush(void)
 {
 	romvec->cache_flush();
 }
diff --git a/arch/mips/arc/printf.c b/arch/mips/arc/printf.c
index 422578017..17e5fe352 100644
--- a/arch/mips/arc/printf.c
+++ b/arch/mips/arc/printf.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@sgi.com)
  *
- * $Id: printf.c,v 1.1 1998/10/18 13:32:09 tsbogend Exp $
+ * $Id: printf.c,v 1.2 1999/06/12 18:42:38 ulfc Exp $
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -16,7 +16,7 @@ static char ppbuf[1024];
 #ifdef CONFIG_SGI_PROM_CONSOLE
 void prom_printf(char *fmt, ...)
 #else
-__initfunc(void prom_printf(char *fmt, ...))
+void __init prom_printf(char *fmt, ...)
 #endif
 {
 	va_list args;
diff --git a/arch/mips/arc/salone.c b/arch/mips/arc/salone.c
index e9502c545..3ed8daa40 100644
--- a/arch/mips/arc/salone.c
+++ b/arch/mips/arc/salone.c
@@ -4,22 +4,22 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: salone.c,v 1.2 1998/04/05 11:24:03 ralf Exp $
+ * $Id: salone.c,v 1.1 1998/10/18 13:32:09 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <asm/sgialib.h>
 
-__initfunc(long prom_load(char *name, unsigned long end, unsigned long *pc, unsigned long *eaddr))
+long __init prom_load(char *name, unsigned long end, unsigned long *pc, unsigned long *eaddr)
 {
 	return romvec->load(name, end, pc, eaddr);
 }
 
-__initfunc(long prom_invoke(unsigned long pc, unsigned long sp, long argc, char **argv, char **envp))
+long __init prom_invoke(unsigned long pc, unsigned long sp, long argc, char **argv, char **envp)
 {
 	return romvec->invoke(pc, sp, argc, argv, envp);
 }
 
-__initfunc(long prom_exec(char *name, long argc, char **argv, char **envp))
+long __init prom_exec(char *name, long argc, char **argv, char **envp)
 {
 	return romvec->exec(name, argc, argv, envp);
 }
diff --git a/arch/mips/arc/time.c b/arch/mips/arc/time.c
index b8dcb1251..34925bacf 100644
--- a/arch/mips/arc/time.c
+++ b/arch/mips/arc/time.c
@@ -3,17 +3,17 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: time.c,v 1.2 1998/04/05 11:24:04 ralf Exp $
+ * $Id: time.c,v 1.1 1998/10/18 13:32:10 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <asm/sgialib.h>
 
-__initfunc(struct linux_tinfo *prom_gettinfo(void))
+struct linux_tinfo * __init prom_gettinfo(void)
 {
 	return romvec->get_tinfo();
 }
 
-__initfunc(unsigned long prom_getrtime(void))
+unsigned long __init prom_getrtime(void)
 {
 	return romvec->get_rtime();
 }
diff --git a/arch/mips/arc/tree.c b/arch/mips/arc/tree.c
index 0ef7ab7f0..2c3ec6744 100644
--- a/arch/mips/arc/tree.c
+++ b/arch/mips/arc/tree.c
@@ -3,48 +3,48 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: tree.c,v 1.2 1998/04/05 11:24:05 ralf Exp $
+ * $Id: tree.c,v 1.1 1998/10/18 13:32:10 tsbogend Exp $
  */
 #include <linux/init.h>
 #include <asm/sgialib.h>
 
 #define DEBUG_PROM_TREE
 
-__initfunc(pcomponent *prom_getsibling(pcomponent *this))
+pcomponent * __init prom_getsibling(pcomponent *this)
 {
 	if(this == PROM_NULL_COMPONENT)
 		return PROM_NULL_COMPONENT;
 	return romvec->next_component(this);
 }
 
-__initfunc(pcomponent *prom_getchild(pcomponent *this))
+pcomponent * __init prom_getchild(pcomponent *this)
 {
 	return romvec->child_component(this);
 }
 
-__initfunc(pcomponent *prom_getparent(pcomponent *child))
+pcomponent * __init prom_getparent(pcomponent *child)
 {
 	if(child == PROM_NULL_COMPONENT)
 		return PROM_NULL_COMPONENT;
 	return romvec->parent_component(child);
 }
 
-__initfunc(long prom_getcdata(void *buffer, pcomponent *this))
+long __init prom_getcdata(void *buffer, pcomponent *this)
 {
 	return romvec->component_data(buffer, this);
 }
 
-__initfunc(pcomponent *prom_childadd(pcomponent *this, pcomponent *tmp, void *data))
+pcomponent * __init prom_childadd(pcomponent *this, pcomponent *tmp, void *data)
 {
 	return romvec->child_add(this, tmp, data);
 }
 
-__initfunc(long prom_delcomponent(pcomponent *this))
+long __init prom_delcomponent(pcomponent *this)
 {
 	return romvec->comp_del(this);
 }
 
-__initfunc(pcomponent *prom_componentbypath(char *path))
+pcomponent * __init prom_componentbypath(char *path)
 {
 	return romvec->component_by_path(path);
 }
@@ -74,7 +74,7 @@ static char *iflags[] = {
 	"input", "output"
 };
 
-__initfunc(static void dump_component(pcomponent *p))
+static void __init dump_component(pcomponent *p)
 {
 	prom_printf("[%p]:class<%s>type<%s>flags<%s>ver<%d>rev<%d>",
 		    p, classes[p->class], types[p->type],
@@ -83,7 +83,7 @@ __initfunc(static void dump_component(pcomponent *p))
 		    p->key, p->amask, (int)p->cdsize, (int)p->ilen, p->iname);
 }
 
-__initfunc(static void traverse(pcomponent *p, int op))
+static void __init traverse(pcomponent *p, int op)
 {
 	dump_component(p);
 	if(prom_getchild(p))
@@ -92,7 +92,7 @@ __initfunc(static void traverse(pcomponent *p, int op))
 		traverse(prom_getsibling(p), 1);
 }
 
-__initfunc(void prom_testtree(void))
+void __init prom_testtree(void)
 {
 	pcomponent *p;