Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86_cpu_topology, not toplogy.

Browse Source
This commit is contained in:
rmind 2010-01-18 16:40:17 +00:00
parent 4798b5bf9f
commit b6c2588582
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/x86/include/cpu.h
View File

@ -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_probe(struct cpu_info *);
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 *);

6
sys/arch/x86/x86/cpu_topology.c
View File

@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.2 2009/05/26 01:42:02 rmind Exp $
#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 */

6
sys/arch/x86/x86/identcpu.c
View File

@ -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(struct cpu_info *ci)
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) {