Module Name: src
Committed By: rmind
Date: Sat May 29 05:53:57 UTC 2010
Modified Files:
src/sys/arch/x86/x86: cpu_topology.c
src/sys/sys: cpu_data.h
Log Message:
Rename ci_node_id to ci_package_id, as some claim that the former might
be confused with NUMA node.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/x86/cpu_topology.c
cvs rdiff -u -r1.30 -r1.31 src/sys/sys/cpu_data.h
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/x86/cpu_topology.c
diff -u src/sys/arch/x86/x86/cpu_topology.c:1.5 src/sys/arch/x86/x86/cpu_topology.c:1.6
--- src/sys/arch/x86/x86/cpu_topology.c:1.5 Sun May 9 20:32:41 2010
+++ src/sys/arch/x86/x86/cpu_topology.c Sat May 29 05:53:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_topology.c,v 1.5 2010/05/09 20:32:41 rmind Exp $ */
+/* $NetBSD: cpu_topology.c,v 1.6 2010/05/29 05:53:57 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.5 2010/05/09 20:32:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.6 2010/05/29 05:53:57 rmind Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -60,7 +60,7 @@
cpu_family = CPUID2FAMILY(ci->ci_signature);
/* Initial values. */
- ci->ci_node_id = apic_id;
+ ci->ci_package_id = apic_id;
ci->ci_core_id = 0;
ci->ci_smt_id = 0;
@@ -161,7 +161,7 @@
}
if (smt_bits + core_bits) {
- ci->ci_node_id = apic_id >> (smt_bits + core_bits);
+ ci->ci_package_id = apic_id >> (smt_bits + core_bits);
}
if (core_bits) {
u_int core_mask = __BITS(smt_bits, smt_bits + core_bits - 1);
Index: src/sys/sys/cpu_data.h
diff -u src/sys/sys/cpu_data.h:1.30 src/sys/sys/cpu_data.h:1.31
--- src/sys/sys/cpu_data.h:1.30 Sun May 9 20:18:40 2010
+++ src/sys/sys/cpu_data.h Sat May 29 05:53:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_data.h,v 1.30 2010/05/09 20:18:40 rmind Exp $ */
+/* $NetBSD: cpu_data.h,v 1.31 2010/05/29 05:53:57 rmind Exp $ */
/*-
* Copyright (c) 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
lwp_t *cpu_onproc; /* bottom level LWP */
CIRCLEQ_ENTRY(cpu_info) cpu_qchain; /* circleq of all CPUs */
- cpuid_t cpu_node_id;
+ cpuid_t cpu_package_id;
cpuid_t cpu_core_id;
cpuid_t cpu_smt_id;
@@ -114,7 +114,7 @@
#define ci_spin_locks2 ci_data.cpu_spin_locks2
#define ci_lkdebug_recurse ci_data.cpu_lkdebug_recurse
-#define ci_node_id ci_data.cpu_node_id
+#define ci_package_id ci_data.cpu_package_id
#define ci_core_id ci_data.cpu_core_id
#define ci_smt_id ci_data.cpu_smt_id
