From 0cc355c2e6d0f1ceb6efa371505ed4fbf0e7568c Mon Sep 17 00:00:00 2001 From: Bryan Cantrill Date: Tue, 8 Sep 2015 08:00:44 +0000 Subject: OS-4648 LX /proc/cpuinfo starts at current CPU instead of #0 --- usr/src/uts/common/brand/lx/procfs/lx_prvnops.c | 4 ++-- usr/src/uts/common/fs/lxproc/lxpr_vnops.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr/src') diff --git a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c index 5569b29b58..4bc6c60a35 100644 --- a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c +++ b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c @@ -4201,7 +4201,7 @@ lxpr_read_uptime(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf) mutex_enter(&cpu_lock); pools_enabled = pool_pset_enabled(); - cp = cpstart = CPU; + cp = cpstart = CPU->cpu_part->cp_cpulist; do { /* * Don't count CPUs that aren't even in the system @@ -4330,7 +4330,7 @@ lxpr_read_cpuinfo(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf) mutex_enter(&cpu_lock); pools_enabled = pool_pset_enabled(); - cp = cpstart = CPU; + cp = cpstart = CPU->cpu_part->cp_cpulist; do { /* * This returns the maximum eax value for standard cpuid diff --git a/usr/src/uts/common/fs/lxproc/lxpr_vnops.c b/usr/src/uts/common/fs/lxproc/lxpr_vnops.c index 48f4efc1bf..6f2e9df774 100644 --- a/usr/src/uts/common/fs/lxproc/lxpr_vnops.c +++ b/usr/src/uts/common/fs/lxproc/lxpr_vnops.c @@ -1857,7 +1857,7 @@ lxpr_read_uptime(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf) mutex_enter(&cpu_lock); pools_enabled = pool_pset_enabled(); - cp = cpstart = CPU; + cp = cpstart = CPU->cpu_part->cp_cpulist; do { /* * Don't count CPUs that aren't even in the system @@ -1968,7 +1968,7 @@ lxpr_read_cpuinfo(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf) mutex_enter(&cpu_lock); pools_enabled = pool_pset_enabled(); - cp = cpstart = CPU; + cp = cpstart = CPU->cpu_part->cp_cpulist; do { /* * This returns the maximum eax value for standard cpuid -- cgit v1.2.3