d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert part of the r211149 as I erroneously ported the logical_cpus from

Browse Source 
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
This commit is contained in:
Attilio Rao 2010-08-19 22:37:43 +00:00
parent 6edc7d2994
commit 67a94de261
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/amd64/mp_machdep.c
View File

@ -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;

6
sys/i386/i386/mp_machdep.c
View File

@ -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;