Author: attilio Date: Thu Aug 19 22:37:43 2010 New Revision: 211518 URL: http://svn.freebsd.org/changeset/base/211518
Log: 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 Modified: head/sys/amd64/amd64/mp_machdep.c head/sys/i386/i386/mp_machdep.c Modified: head/sys/amd64/amd64/mp_machdep.c ============================================================================== --- head/sys/amd64/amd64/mp_machdep.c Thu Aug 19 21:59:39 2010 (r211517) +++ head/sys/amd64/amd64/mp_machdep.c Thu Aug 19 22:37:43 2010 (r211518) @@ -127,7 +127,7 @@ extern inthand_t IDTVEC(fast_syscall), I * 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; Modified: head/sys/i386/i386/mp_machdep.c ============================================================================== --- head/sys/i386/i386/mp_machdep.c Thu Aug 19 21:59:39 2010 (r211517) +++ head/sys/i386/i386/mp_machdep.c Thu Aug 19 22:37:43 2010 (r211518) @@ -174,7 +174,7 @@ static u_long *ipi_statclock_counts[MAXC * 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; _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
