patch-2.1.97 linux/arch/sparc/prom/bootstr.c

• Lines: 31
• Date: Tue Apr 14 17:44:20 1998
• Orig file: v2.1.96/linux/arch/sparc/prom/bootstr.c
• Orig date: Mon Jul 7 08:18:54 1997

diff -u --recursive --new-file v2.1.96/linux/arch/sparc/prom/bootstr.c linux/arch/sparc/prom/bootstr.c
@@ -1,4 +1,4 @@
-/* $Id: bootstr.c,v 1.14 1997/06/19 16:28:49 jj Exp $
+/* $Id: bootstr.c,v 1.17 1998/02/09 13:26:21 jj Exp $
  * bootstr.c:  Boot string/argument acquisition from the PROM.
  *
  * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -7,12 +7,15 @@
 #include <linux/config.h>
 #include <linux/string.h>
 #include <asm/oplib.h>
+#include <asm/sun4prom.h>
 #include <linux/init.h>
 
 #define BARG_LEN  256
-static char barg_buf[BARG_LEN] __initdata = { 0 };
+static char barg_buf[BARG_LEN] = { 0 };
 static char fetched __initdata = 0;
 
+extern linux_sun4_romvec *sun4_romvec;
+
 __initfunc(char *
 prom_getbootargs(void))
 {
@@ -26,6 +29,7 @@
 
 	switch(prom_vers) {
 	case PROM_V0:
+	case PROM_SUN4:
 		cp = barg_buf;
 		/* Start from 1 and go over fd(0,0,0)kernel */
 		for(iter = 1; iter < 8; iter++) {