diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2016-10-27 09:46:15 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2016-10-27 09:46:15 +0000 |
| commit | a33fb1ee266c8a3cd1bea8964a978d70f35fb554 (patch) | |
| tree | d09c03e5e942c3bc8f7ca343f1654f4d4a07e149 /sys | |
| parent | fc8f2e7f294d95f6f3a8eb7cad4dbe203d8b67b0 (diff) | |
revert 1.41 now that subr_percpu is using ncpusfound instead of ncpus.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/alpha/cpu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c index 352caee0873..fba82485d3b 100644 --- a/sys/arch/alpha/alpha/cpu.c +++ b/sys/arch/alpha/alpha/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.41 2016/10/27 05:36:35 dlg Exp $ */ +/* $OpenBSD: cpu.c,v 1.42 2016/10/27 09:46:14 dlg Exp $ */ /* $NetBSD: cpu.c,v 1.44 2000/05/23 05:12:53 thorpej Exp $ */ /*- @@ -294,10 +294,8 @@ recognized: #if defined(MULTIPROCESSOR) if (ma->ma_slot == hwrpb->rpb_primary_cpu_id) ci = &cpu_info_primary; - else { + else ci = malloc(sizeof(*ci), M_DEVBUF, M_WAITOK | M_ZERO); - ncpus++; - } cpu_info[ma->ma_slot] = ci; #else @@ -441,6 +439,7 @@ cpu_boot_secondary_processors(void) cpu_info_list->ci_next = ci; atomic_setbits_ulong(&ci->ci_flags, CPUF_RUNNING); atomic_setbits_ulong(&cpus_running, (1UL << i)); + ncpus++; } /* |