Module Name: src
Committed By: snj
Date: Tue May 19 05:43:50 UTC 2015
Modified Files:
src/sys/arch/vax/vax [netbsd-6]: ka660.c
Log Message:
Pull up following revision(s) (requested by ragge in ticket #1298):
sys/arch/vax/vax/ka660.c: revision 1.11
PR port-vax/49884
Fixes bug introduced in earlier cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.14.1 src/sys/arch/vax/vax/ka660.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/vax/ka660.c
diff -u src/sys/arch/vax/vax/ka660.c:1.10 src/sys/arch/vax/vax/ka660.c:1.10.14.1
--- src/sys/arch/vax/vax/ka660.c:1.10 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/ka660.c Tue May 19 05:43:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: ka660.c,v 1.10.14.1 2015/05/19 05:43:50 snj Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.10.14.1 2015/05/19 05:43:50 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ static void ka660_cache_enable(void);
static void ka660_attach_cpu(device_t);
static int ka660_mchk(void *);
-static const char * const ka660_devs[] = { "cpu", "sgec", "vsbus", NULL };
+static const char * const ka660_devs[] = { "cpu", "sgec", "shac", "uba", NULL };
/*
* Declaration of 660-specific calls.
@@ -92,7 +92,7 @@ void
ka660_attach_cpu(device_t self)
{
aprint_normal(
- ": %s, Rigel (ucode rev. %d), 2KB L1 cache, 128KB L2 cache\n",
+ ": %s, SOC (ucode rev. %d), 6KB L1 cache\n",
"KA660",
vax_cpudata & 0377);
}
