diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
tree | 22c47cb315811834861f013067878ff664e95abd /arch/sparc/prom/bootstr.c | |
parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) |
Sync with Linux 2.1.46.
Diffstat (limited to 'arch/sparc/prom/bootstr.c')
-rw-r--r-- | arch/sparc/prom/bootstr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr.c index 1722d9fdc..e7bd9b06d 100644 --- a/arch/sparc/prom/bootstr.c +++ b/arch/sparc/prom/bootstr.c @@ -1,4 +1,4 @@ -/* $Id: bootstr.c,v 1.12 1996/12/18 06:46:54 tridge Exp $ +/* $Id: bootstr.c,v 1.14 1997/06/19 16:28:49 jj Exp $ * bootstr.c: Boot string/argument acquisition from the PROM. * * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -7,13 +7,14 @@ #include <linux/config.h> #include <linux/string.h> #include <asm/oplib.h> +#include <linux/init.h> #define BARG_LEN 256 -static char barg_buf[BARG_LEN]; -static char fetched = 0; +static char barg_buf[BARG_LEN] __initdata = { 0 }; +static char fetched __initdata = 0; -char * -prom_getbootargs(void) +__initfunc(char * +prom_getbootargs(void)) { int iter; char *cp, *arg; |