Module Name: src
Committed By: snj
Date: Sun Oct 4 00:16:53 UTC 2009
Modified Files:
src/usr.sbin/cpuctl/arch [netbsd-5]: i386.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1055):
usr.sbin/cpuctl/arch/i386.c: revision 1.20
- add newer VIA C7 core and VIA Nano.
- when printing an unknown VIA CPU, default to 'Unknown IDT/VIA' instead of 'C3'
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.13.2.3 src/usr.sbin/cpuctl/arch/i386.c:1.13.2.4
--- src/usr.sbin/cpuctl/arch/i386.c:1.13.2.3 Mon May 18 19:43:55 2009
+++ src/usr.sbin/cpuctl/arch/i386.c Sun Oct 4 00:16:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.13.2.3 2009/05/18 19:43:55 bouyer Exp $ */
+/* $NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.13.2.3 2009/05/18 19:43:55 bouyer Exp $");
+__RCSID("$NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -546,8 +546,9 @@
{
0, 0, 0, 0, 0, 0, "C3 Samuel",
"C3 Samuel 2/Ezra", "C3 Ezra-T",
- "C3 Nehemiah", "C7 Esther", 0, 0, 0, 0, 0,
- "C3" /* Default */
+ "C3 Nehemiah", "C7 Esther", 0, 0, "C7 Esther",
+ 0, "VIA Nano",
+ "Unknown VIA/IDT" /* Default */
},
NULL,
via_cpu_probe,