From 67a94de261d38c04532f3992ea71906f0cdde8f2 Mon Sep 17 00:00:00 2001 From: Attilio Rao Date: Thu, 19 Aug 2010 22:37:43 +0000 Subject: [PATCH] Revert part of the r211149 as I erroneously ported the logical_cpus from Yahoo! patchset as a mask (and according manipulating variables) while it is actually a CPU count. Submitted by: neel MFC after: 1 month X-MFC: 211149 --- sys/amd64/amd64/mp_machdep.c | 6 +++--- sys/i386/i386/mp_machdep.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 034ae77cc82d..e2f82ec282e0 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -127,7 +127,7 @@ extern inthand_t IDTVEC(fast_syscall), IDTVEC(fast_syscall32); * Local data and functions. */ -static cpumask_t logical_cpus; +static u_int logical_cpus; static volatile cpumask_t ipi_nmi_pending; /* used to hold the AP's until we are ready to release them */ @@ -162,8 +162,8 @@ static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); -static cpumask_t hlt_logical_cpus; -static cpumask_t hyperthreading_cpus; +static int hlt_logical_cpus; +static u_int hyperthreading_cpus; static cpumask_t hyperthreading_cpus_mask; static int hyperthreading_allowed = 1; static struct sysctl_ctx_list logical_cpu_clist; diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index ddbb6318cb8a..fa50ecfe6247 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -174,7 +174,7 @@ static u_long *ipi_statclock_counts[MAXCPU]; * Local data and functions. */ -static cpumask_t logical_cpus; +static u_int logical_cpus; static volatile cpumask_t ipi_nmi_pending; /* used to hold the AP's until we are ready to release them */ @@ -210,8 +210,8 @@ static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); -static cpumask_t hlt_logical_cpus; -static cpumask_t hyperthreading_cpus; +static int hlt_logical_cpus; +static u_int hyperthreading_cpus; static cpumask_t hyperthreading_cpus_mask; static int hyperthreading_allowed = 1; static struct sysctl_ctx_list logical_cpu_clist;