[src/trunk]: src/sys Rename ci_node_id to ci_package_id, as some claim that t...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e54c5951ce2
branches:  trunk
changeset: 755233:9e54c5951ce2
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sat May 29 05:53:57 2010 +0000

description:
Rename ci_node_id to ci_package_id, as some claim that the former might
be confused with NUMA node.

diffstat:

 sys/arch/x86/x86/cpu_topology.c |  8 ++++----
 sys/sys/cpu_data.h              |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 995899938ad6 -r 9e54c5951ce2 sys/arch/x86/x86/cpu_topology.c
--- a/sys/arch/x86/x86/cpu_topology.c   Sat May 29 01:14:29 2010 +0000
+++ b/sys/arch/x86/x86/cpu_topology.c   Sat May 29 05:53:57 2010 +0000
@@ -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);
diff -r 995899938ad6 -r 9e54c5951ce2 sys/sys/cpu_data.h
--- a/sys/sys/cpu_data.h        Sat May 29 01:14:29 2010 +0000
+++ b/sys/sys/cpu_data.h        Sat May 29 05:53:57 2010 +0000
@@ -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