diff options
| author | attilio <attilio@FreeBSD.org> | 2010-08-19 22:37:43 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2010-08-19 22:37:43 +0000 |
| commit | df3fa718d477fbac636ef9b3922354f33d8635e8 (patch) | |
| tree | b9a0f1688c08899d80aa2263447becc43e1b9fa4 /sys/amd64/amd64/mp_machdep.c | |
| parent | 3307198f061e60ddc4086ac034465b250f943765 (diff) | |
| download | FreeBSD-src-df3fa718d477fbac636ef9b3922354f33d8635e8.zip FreeBSD-src-df3fa718d477fbac636ef9b3922354f33d8635e8.tar.gz | |
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
Diffstat (limited to 'sys/amd64/amd64/mp_machdep.c')
| -rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 034ae77..e2f82ec 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; |
