Module Name: src
Committed By: rmind
Date: Mon Jan 18 16:40:18 UTC 2010
Modified Files:
src/sys/arch/x86/include: cpu.h
src/sys/arch/x86/x86: cpu_topology.c identcpu.c
Log Message:
x86_cpu_topology, not toplogy.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/cpu_topology.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/x86/identcpu.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/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.19 src/sys/arch/x86/include/cpu.h:1.20
--- src/sys/arch/x86/include/cpu.h:1.19 Sat Jan 9 20:56:17 2010
+++ src/sys/arch/x86/include/cpu.h Mon Jan 18 16:40:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.19 2010/01/09 20:56:17 cegger Exp $ */
+/* $NetBSD: cpu.h,v 1.20 2010/01/18 16:40:17 rmind Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -355,7 +355,7 @@
void cpu_identify(struct cpu_info *);
/* cpu_topology.c */
-void x86_cpu_toplogy(struct cpu_info *);
+void x86_cpu_topology(struct cpu_info *);
/* vm_machdep.c */
void cpu_proc_fork(struct proc *, struct proc *);
Index: src/sys/arch/x86/x86/cpu_topology.c
diff -u src/sys/arch/x86/x86/cpu_topology.c:1.2 src/sys/arch/x86/x86/cpu_topology.c:1.3
--- src/sys/arch/x86/x86/cpu_topology.c:1.2 Tue May 26 01:42:02 2009
+++ src/sys/arch/x86/x86/cpu_topology.c Mon Jan 18 16:40:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_topology.c,v 1.2 2009/05/26 01:42:02 rmind Exp $ */
+/* $NetBSD: cpu_topology.c,v 1.3 2010/01/18 16:40:17 rmind Exp $ */
/*-
* Copyright (c) 2009 Mindaugas Rasiukevicius <rmind at NetBSD org>,
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.2 2009/05/26 01:42:02 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.3 2010/01/18 16:40:17 rmind Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -49,7 +49,7 @@
#include <x86/cpuvar.h>
void
-x86_cpu_toplogy(struct cpu_info *ci)
+x86_cpu_topology(struct cpu_info *ci)
{
u_int lp_max; /* Logical processors per package */
u_int core_max; /* Core per package */
Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.17 src/sys/arch/x86/x86/identcpu.c:1.18
--- src/sys/arch/x86/x86/identcpu.c:1.17 Fri Oct 2 18:50:03 2009
+++ src/sys/arch/x86/x86/identcpu.c Mon Jan 18 16:40:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.17 2009/10/02 18:50:03 jmcneill Exp $ */
+/* $NetBSD: identcpu.c,v 1.18 2010/01/18 16:40:18 rmind Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.17 2009/10/02 18:50:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.18 2010/01/18 16:40:18 rmind Exp $");
#include "opt_enhanced_speedstep.h"
#include "opt_intel_odcm.h"
@@ -652,7 +652,7 @@
cpu_probe_c3(ci);
cpu_probe_geode(ci);
- x86_cpu_toplogy(ci);
+ x86_cpu_topology(ci);
if (cpu_vendor != CPUVENDOR_AMD && (ci->ci_feature_flags & CPUID_TM) &&
(rdmsr(MSR_MISC_ENABLE) & (1 << 3)) == 0) {
