Module Name: src
Committed By: snj
Date: Wed Mar 17 02:51:10 UTC 2010
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-5]: cpu.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1331):
sys/arch/sparc64/sparc64/cpu.c: revision 1.91
- don't print cache sizes * associativity. this has been wrong for years.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.78.4.1 src/sys/arch/sparc64/sparc64/cpu.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/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.78 src/sys/arch/sparc64/sparc64/cpu.c:1.78.4.1
--- src/sys/arch/sparc64/sparc64/cpu.c:1.78 Sat Oct 18 04:41:14 2008
+++ src/sys/arch/sparc64/sparc64/cpu.c Wed Mar 17 02:51:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.78 2008/10/18 04:41:14 nakayama Exp $ */
+/* $NetBSD: cpu.c,v 1.78.4.1 2010/03/17 02:51:09 snj Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.78 2008/10/18 04:41:14 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.78.4.1 2010/03/17 02:51:09 snj Exp $");
#include "opt_multiprocessor.h"
@@ -279,9 +279,7 @@
/* void */;
if ((1 << i) != l && l)
panic("bad icache line size %d", l);
- totalsize =
- prom_getpropint(node, "icache-size", 0) *
- prom_getpropint(node, "icache-associativity", 1);
+ totalsize = prom_getpropint(node, "icache-size", 0);
if (totalsize == 0)
totalsize = l *
prom_getpropint(node, "icache-nlines", 64) *
@@ -305,9 +303,7 @@
/* void */;
if ((1 << i) != l && l)
panic("bad dcache line size %d", l);
- totalsize =
- prom_getpropint(node, "dcache-size", 0) *
- prom_getpropint(node, "dcache-associativity", 1);
+ totalsize = prom_getpropint(node, "dcache-size", 0);
if (totalsize == 0)
totalsize = l *
prom_getpropint(node, "dcache-nlines", 128) *
@@ -331,9 +327,7 @@
/* void */;
if ((1 << i) != l && l)
panic("bad ecache line size %d", l);
- totalsize =
- prom_getpropint(node, "ecache-size", 0) *
- prom_getpropint(node, "ecache-associativity", 1);
+ totalsize = prom_getpropint(node, "ecache-size", 0);
if (totalsize == 0)
totalsize = l *
prom_getpropint(node, "ecache-nlines", 32768) *
