patch-2.4.20 linux-2.4.20/arch/mips/arc/identify.c
Next file: linux-2.4.20/arch/mips/arc/init.c
Previous file: linux-2.4.20/arch/mips/arc/console.c
Back to the patch index
Back to the overall index
- Lines: 77
- Date:
Thu Nov 28 15:53:09 2002
- Orig file:
linux-2.4.19/arch/mips/arc/identify.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/mips/arc/identify.c linux-2.4.20/arch/mips/arc/identify.c
@@ -1,10 +1,14 @@
/*
+ * 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.
+ *
* identify.c: identify machine by looking up system identifier
*
* Copyright (C) 1998 Thomas Bogendoerfer
- *
+ *
* This code is based on arch/mips/sgi/kernel/system.c, which is
- *
+ *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*/
#include <linux/config.h>
@@ -13,7 +17,6 @@
#include <linux/types.h>
#include <linux/string.h>
-#include <asm/sgi/sgi.h>
#include <asm/sgialib.h>
#include <asm/bootinfo.h>
@@ -31,6 +34,21 @@
MACH_GROUP_SGI,
MACH_SGI_INDY,
PROM_FLAG_ARCS
+ }, { "SGI-IP27",
+ "SGI Origin",
+ MACH_GROUP_SGI,
+ MACH_SGI_IP27,
+ PROM_FLAG_ARCS
+ }, { "SGI-IP28",
+ "SGI IP28",
+ MACH_GROUP_SGI,
+ MACH_SGI_IP28,
+ PROM_FLAG_ARCS
+ }, { "SGI-IP32",
+ "SGI IP32",
+ MACH_GROUP_SGI,
+ MACH_SGI_IP32,
+ PROM_FLAG_ARCS
}, { "Microsoft-Jazz",
"Jazz MIPS_Magnum_4000",
MACH_GROUP_JAZZ,
@@ -51,7 +69,7 @@
int prom_flags;
-static struct smatch *__init string_to_mach(const char *s)
+static struct smatch * __init string_to_mach(const char *s)
{
int i;
@@ -77,15 +95,16 @@
const char *iname;
/*
- * The root component tells us what machine architecture we
- * have here.
+ * The root component tells us what machine architecture we have here.
*/
p = ArcGetChild(PROM_NULL_COMPONENT);
if (p == NULL) {
#ifdef CONFIG_SGI_IP27
- /* IP27 PROM bisbehaves, seems to not implement ARC
- GetChild(). So we just assume it's an IP27. */
+ /* IP27 PROM misbehaves, seems to not implement ARC
+ GetChild(). So we just assume it's an IP27. */
iname = "SGI-IP27";
+#else
+ iname = "Unknown";
#endif
} else
iname = (char *) (long) p->iname;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)