diff options
Diffstat (limited to 'arch/mips/dec')
| -rw-r--r-- | arch/mips/dec/irq.c | 4 | ||||
| -rw-r--r-- | arch/mips/dec/prom/cmdline.c | 4 | ||||
| -rw-r--r-- | arch/mips/dec/prom/identify.c | 4 | ||||
| -rw-r--r-- | arch/mips/dec/prom/init.c | 8 | ||||
| -rw-r--r-- | arch/mips/dec/prom/memory.c | 10 | ||||
| -rw-r--r-- | arch/mips/dec/promcon.c | 4 | ||||
| -rw-r--r-- | arch/mips/dec/serial.c | 7 | ||||
| -rw-r--r-- | arch/mips/dec/setup.c | 20 | ||||
| -rw-r--r-- | arch/mips/dec/time.c | 2 | ||||
| -rw-r--r-- | arch/mips/dec/wbflush.c | 4 |
10 files changed, 34 insertions, 33 deletions
diff --git a/arch/mips/dec/irq.c b/arch/mips/dec/irq.c index d5d6303ed..ca32b7a4c 100644 --- a/arch/mips/dec/irq.c +++ b/arch/mips/dec/irq.c @@ -4,7 +4,7 @@ * Copyright (C) 1992 Linus Torvalds * Copyright (C) 1994, 1995, 1996, 1997 Ralf Baechle * - * $Id: irq.c,v 1.2 1999/01/17 03:49:41 ralf Exp $ + * $Id: irq.c,v 1.3 1999/04/11 17:06:16 harald Exp $ */ #include <linux/errno.h> #include <linux/init.h> @@ -263,7 +263,7 @@ int probe_irq_off(unsigned long irqs) return 0; } -__initfunc(void init_IRQ(void)) +void __init init_IRQ(void) { irq_setup(); } diff --git a/arch/mips/dec/prom/cmdline.c b/arch/mips/dec/prom/cmdline.c index 31d6ec318..421d4058b 100644 --- a/arch/mips/dec/prom/cmdline.c +++ b/arch/mips/dec/prom/cmdline.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998 Harald Koerfgen * - * $Id: $ + * $Id: cmdline.c,v 1.1 1999/01/17 03:49:44 ralf Exp $ */ #include <linux/init.h> #include <linux/kernel.h> @@ -22,7 +22,7 @@ extern int (*prom_printf)(char *, ...); char arcs_cmdline[CL_SIZE]; -__initfunc(void prom_init_cmdline(int argc, char **argv, unsigned long magic)) +void __init prom_init_cmdline(int argc, char **argv, unsigned long magic) { int start_arg, i; diff --git a/arch/mips/dec/prom/identify.c b/arch/mips/dec/prom/identify.c index 65d7b5abf..dbb1e98bc 100644 --- a/arch/mips/dec/prom/identify.c +++ b/arch/mips/dec/prom/identify.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998 Harald Koerfgen and Paul M. Antoine * - * $Id: $ + * $Id: identify.c,v 1.1 1999/01/17 03:49:44 ralf Exp $ */ #include <linux/init.h> #include <linux/config.h> @@ -22,7 +22,7 @@ extern int (*rex_getsysid)(void); extern unsigned long mips_machgroup; extern unsigned long mips_machtype; -__initfunc(void prom_identify_arch (unsigned int magic)) +void __init prom_identify_arch (unsigned int magic) { unsigned char dec_cpunum, dec_firmrev, dec_etc; int dec_systype; diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c index b751e8515..f81ee77ca 100644 --- a/arch/mips/dec/prom/init.c +++ b/arch/mips/dec/prom/init.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998 Harald Koerfgen * - * $Id: $ + * $Id: init.c,v 1.3 1999/08/09 19:43:13 harald Exp $ */ #include <linux/init.h> #include <linux/config.h> @@ -43,7 +43,7 @@ extern void prom_init_cmdline(int, char **, unsigned long); * Detect which PROM's the DECSTATION has, and set the callback vectors * appropriately. */ -__initfunc(void which_prom(unsigned long magic, int *prom_vec)) +void __init which_prom(unsigned long magic, int *prom_vec) { /* * No sign of the REX PROM's magic number means we assume a non-REX @@ -80,8 +80,8 @@ __initfunc(void which_prom(unsigned long magic, int *prom_vec)) } } -__initfunc(int prom_init(int argc, char **argv, - unsigned long magic, int *prom_vec)) +int __init prom_init(int argc, char **argv, + unsigned long magic, int *prom_vec) { extern void dec_machine_halt(void); diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index de80c34e8..20e55fdc6 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998 Harald Koerfgen, Frieder Streffer and Paul M. Antoine * - * $Id: $ + * $Id: memory.c,v 1.2 1999/04/11 17:06:17 harald Exp $ */ #include <asm/addrspace.h> #include <linux/init.h> @@ -35,7 +35,7 @@ volatile unsigned long mem_err = 0; /* So we know an error occured */ #define CHUNK_SIZE 0x400000 -__initfunc(unsigned long pmax_get_memory_size(void)) +unsigned long __init pmax_get_memory_size(void) { volatile unsigned char *memory_page, dummy; char old_handler[0x80]; @@ -63,7 +63,7 @@ __initfunc(unsigned long pmax_get_memory_size(void)) * Use the REX prom calls to get hold of the memory bitmap, and thence * determine memory size. */ -__initfunc(unsigned long rex_get_memory_size(void)) +unsigned long __init rex_get_memory_size(void) { int i, bitmap_size; unsigned long mem_size = 0; @@ -82,7 +82,7 @@ __initfunc(unsigned long rex_get_memory_size(void)) return (mem_size); } -__initfunc(void prom_meminit(unsigned int magic)) +void __init prom_meminit(unsigned int magic) { if (magic != REX_PROM_MAGIC) mips_memory_upper = KSEG0 + pmax_get_memory_size(); @@ -95,7 +95,7 @@ __initfunc(void prom_meminit(unsigned int magic)) } /* 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) { } diff --git a/arch/mips/dec/promcon.c b/arch/mips/dec/promcon.c index 8399e5db1..de9eaf5b2 100644 --- a/arch/mips/dec/promcon.c +++ b/arch/mips/dec/promcon.c @@ -35,7 +35,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; } @@ -64,7 +64,7 @@ static struct console sercons = * Register console. */ -__initfunc(long prom_console_init(long kmem_start, long kmem_end)) +long __init prom_console_init(long kmem_start, long kmem_end) { register_console(&sercons); return kmem_start; diff --git a/arch/mips/dec/serial.c b/arch/mips/dec/serial.c index fcf324199..6cb764d02 100644 --- a/arch/mips/dec/serial.c +++ b/arch/mips/dec/serial.c @@ -16,7 +16,8 @@ * console device I strongly recommend to use only one. */ -#include <asm/init.h> +#include <linux/config.h> +#include <linux/init.h> #include <asm/dec/machtype.h> #ifdef CONFIG_ZS @@ -44,7 +45,7 @@ extern long dz_serial_console_init(long, long); #ifdef CONFIG_SERIAL -__initfunc(int rs_init(void)) +int __init rs_init(void) { #if defined(CONFIG_ZS) && defined(CONFIG_DZ) @@ -72,7 +73,7 @@ __initfunc(int rs_init(void)) /* serial_console_init handles the special case of starting * up the console on the serial port */ -__initfunc(long serial_console_init(long kmem_start, long kmem_end)) +long __init serial_console_init(long kmem_start, long kmem_end) { #if defined(CONFIG_ZS) && defined(CONFIG_DZ) if (IOASIC) diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index 3b2422418..848d2bb74 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c @@ -13,7 +13,7 @@ #include <linux/param.h> #include <asm/mipsregs.h> #include <asm/bootinfo.h> -#include <asm/init.h> +#include <linux/init.h> #include <asm/irq.h> #include <asm/reboot.h> @@ -60,7 +60,7 @@ extern int setup_dec_irq(int, struct irqaction *); void (*board_time_init) (struct irqaction * irq); -__initfunc(static void dec_irq_setup(void)) +static void __init dec_irq_setup(void) { switch (mips_machtype) { case MACH_DS23100: @@ -97,7 +97,7 @@ __initfunc(static void dec_irq_setup(void)) /* * enable the periodic interrupts */ -__initfunc(static void dec_time_init(struct irqaction *irq)) +static void __init dec_time_init(struct irqaction *irq) { /* * Here we go, enable periodic rtc interrupts. @@ -112,7 +112,7 @@ __initfunc(static void dec_time_init(struct irqaction *irq)) setup_dec_irq(CLOCK, irq); } -__initfunc(void decstation_setup(void)) +void __init decstation_setup(void) { irq_setup = dec_irq_setup; board_time_init = dec_time_init; @@ -130,7 +130,7 @@ __initfunc(void decstation_setup(void)) * Machine-specific initialisation for kn01, aka Pmax, aka DS2100, DS3100, * and possibly also the DS5100. */ -__initfunc(void dec_init_kn01(void)) +void __init dec_init_kn01(void) { /* * Setup some memory addresses. @@ -176,7 +176,7 @@ __initfunc(void dec_init_kn01(void)) * * There are a lot of experiments to do, this is definitely incomplete. */ -__initfunc(void dec_init_kn230(void)) +void __init dec_init_kn230(void) { /* * Setup some memory addresses. @@ -200,7 +200,7 @@ __initfunc(void dec_init_kn230(void)) /* * Machine-specific initialisation for kn02, aka 3max, aka DS5000/2xx. */ -__initfunc(void dec_init_kn02(void)) +void __init dec_init_kn02(void) { /* * Setup some memory addresses. FIXME: probably incomplete! @@ -270,7 +270,7 @@ __initfunc(void dec_init_kn02(void)) /* * Machine-specific initialisation for kn02ba, aka 3min, aka DS5000/1xx. */ -__initfunc(void dec_init_kn02ba(void)) +void __init dec_init_kn02ba(void) { /* * Setup some memory addresses. @@ -350,7 +350,7 @@ __initfunc(void dec_init_kn02ba(void)) /* * Machine-specific initialisation for kn02ca, aka maxine, aka DS5000/2x. */ -__initfunc(void dec_init_kn02ca(void)) +void __init dec_init_kn02ca(void) { /* * Setup some memory addresses. FIXME: probably incomplete! @@ -425,7 +425,7 @@ __initfunc(void dec_init_kn02ca(void)) /* * Machine-specific initialisation for kn03, aka 3max+, aka DS5000/240. */ -__initfunc(void dec_init_kn03(void)) +void __init dec_init_kn03(void) { /* * Setup some memory addresses. FIXME: probably incomplete! diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index dd4951691..9f009680d 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -385,7 +385,7 @@ struct irqaction irq0 = void (*board_time_init) (struct irqaction * irq); -__initfunc(void time_init(void)) +void __init time_init(void) { unsigned int year, mon, day, hour, min, sec; int i; diff --git a/arch/mips/dec/wbflush.c b/arch/mips/dec/wbflush.c index 6b183634b..516a4ad2b 100644 --- a/arch/mips/dec/wbflush.c +++ b/arch/mips/dec/wbflush.c @@ -14,7 +14,7 @@ */ #include <asm/bootinfo.h> -#include <asm/init.h> +#include <linux/init.h> static void wbflush_kn01(void); static void wbflush_kn210(void); @@ -23,7 +23,7 @@ static void wbflush_kn03(void); void (*__wbflush) (void); -__initfunc(void wbflush_setup(void)) +void __init wbflush_setup(void) { switch (mips_machtype) { case MACH_DS23100: |