View | Details | Raw Unified | Return to bug 145385 | Differences between
and this patch

Collapse All | Expand All

(-)mp_machdep.c (-9 / +2 lines)
Lines 203-209 Link Here
203
				cnt++;
203
				cnt++;
204
		}
204
		}
205
		if (type == CPUID_TYPE_SMT)
205
		if (type == CPUID_TYPE_SMT)
206
			cpu_logical = cnt;
206
			cpu_logical = logical_cpus = cnt;
207
		else if (type == CPUID_TYPE_CORE)
207
		else if (type == CPUID_TYPE_CORE)
208
			cpu_cores = cnt;
208
			cpu_cores = cnt;
209
	}
209
	}
Lines 1536-1555 Link Here
1536
#ifdef MP_WATCHDOG
1536
#ifdef MP_WATCHDOG
1537
	u_int cpuid;
1537
	u_int cpuid;
1538
#endif
1538
#endif
1539
	int retval;
1540
1539
1541
	mask = PCPU_GET(cpumask);
1540
	mask = PCPU_GET(cpumask);
1542
#ifdef MP_WATCHDOG
1541
#ifdef MP_WATCHDOG
1543
	cpuid = PCPU_GET(cpuid);
1542
	cpuid = PCPU_GET(cpuid);
1544
	ap_watchdog(cpuid);
1543
	ap_watchdog(cpuid);
1545
#endif
1544
#endif
1546
1545
	return (mask & hlt_cpus_mask);
1547
	retval = 0;
1548
	while (mask & hlt_cpus_mask) {
1549
		retval = 1;
1550
		__asm __volatile("sti; hlt" : : : "memory");
1551
	}
1552
	return (retval);
1553
}
1546
}
1554
1547
1555
#ifdef COUNT_IPIS
1548
#ifdef COUNT_IPIS

Return to bug 145385