diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2016-10-27 13:19:28 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2016-10-27 13:19:28 +0000 |
| commit | d4993528a35617b43977824cc887e7944c7f2cee (patch) | |
| tree | 297c7859f79927966122a31aed8bb7f513826ccc /sys/arch | |
| parent | cbc7603ef13bdfb79a80ac1b9181598852f3eb7c (diff) | |
Revert previous `ncpus' change because the percpu code now works
without it.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mips64/mips64/cpu.c | 3 | ||||
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 3 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/ip27_machdep.c | 3 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/ip30_machdep.c | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c index 22287cc539d..21573d2dbbb 100644 --- a/sys/arch/mips64/mips64/cpu.c +++ b/sys/arch/mips64/mips64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.61 2016/10/26 13:42:54 visa Exp $ */ +/* $OpenBSD: cpu.c,v 1.62 2016/10/27 13:19:27 visa Exp $ */ /* * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se) @@ -102,7 +102,6 @@ cpuattach(struct device *parent, struct device *dev, void *aux) ci->ci_next = cpu_info_list->ci_next; cpu_info_list->ci_next = ci; ci->ci_flags |= CPUF_PRESENT; - ncpus++; } #endif ci->ci_self = ci; diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 00f2a7cac34..e60a6f0f284 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.77 2016/10/26 13:42:54 visa Exp $ */ +/* $OpenBSD: machdep.c,v 1.78 2016/10/27 13:19:27 visa Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -859,6 +859,7 @@ hw_cpu_hatch(struct cpu_info *ci) printf("cpu%lu launched\n", cpu_number()); (*md_startclock)(ci); + ncpus++; cpuset_add(&cpus_running, ci); octeon_intr_init(); mips64_ipi_init(); diff --git a/sys/arch/sgi/sgi/ip27_machdep.c b/sys/arch/sgi/sgi/ip27_machdep.c index f0095769bc7..646e2696708 100644 --- a/sys/arch/sgi/sgi/ip27_machdep.c +++ b/sys/arch/sgi/sgi/ip27_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip27_machdep.c,v 1.75 2016/10/26 13:42:54 visa Exp $ */ +/* $OpenBSD: ip27_machdep.c,v 1.76 2016/10/27 13:19:27 visa Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -1211,6 +1211,7 @@ hw_cpu_hatch(struct cpu_info *ci) (*md_startclock)(ci); + ncpus++; cpuset_add(&cpus_running, ci); mips64_ipi_init(); diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c index 142a001a74b..21c5875678a 100644 --- a/sys/arch/sgi/sgi/ip30_machdep.c +++ b/sys/arch/sgi/sgi/ip30_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip30_machdep.c,v 1.67 2016/10/26 13:42:54 visa Exp $ */ +/* $OpenBSD: ip30_machdep.c,v 1.68 2016/10/27 13:19:27 visa Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -573,6 +573,7 @@ hw_cpu_hatch(struct cpu_info *ci) (*md_startclock)(ci); + ncpus++; cpuset_add(&cpus_running, ci); mips64_ipi_init(); |