[src/trunk]: src/sys/kern Don't decrement the number of offline cpus if we fa...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d96dec4843fd
branches:  trunk
changeset: 340256:d96dec4843fd
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Aug 29 12:24:00 2015 +0000

description:
Don't decrement the number of offline cpus if we fail to shut down one.

ok christos@, via tech-kern@

diffstat:

 sys/kern/kern_cpu.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 6099083fdf6b -r d96dec4843fd sys/kern/kern_cpu.c
--- a/sys/kern/kern_cpu.c       Sat Aug 29 10:00:19 2015 +0000
+++ b/sys/kern/kern_cpu.c       Sat Aug 29 12:24:00 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_cpu.c,v 1.70 2015/08/20 09:45:45 christos Exp $   */
+/*     $NetBSD: kern_cpu.c,v 1.71 2015/08/29 12:24:00 maxv Exp $       */
 
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.70 2015/08/20 09:45:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.71 2015/08/29 12:24:00 maxv Exp $");
 
 #include "opt_cpu_ucode.h"
 #include "opt_compat_netbsd.h"
@@ -444,7 +444,6 @@
                if ((spc->spc_flags & SPCF_OFFLINE) == 0)
                        return 0;
                func = (xcfunc_t)cpu_xc_online;
-               ncpuonline++;
        } else {
                if ((spc->spc_flags & SPCF_OFFLINE) != 0)
                        return 0;
@@ -463,16 +462,19 @@
                if (nonline == 1)
                        return EBUSY;
                func = (xcfunc_t)cpu_xc_offline;
-               ncpuonline--;
        }
 
        where = xc_unicast(0, func, ci, NULL, ci);
        xc_wait(where);
        if (online) {
                KASSERT((spc->spc_flags & SPCF_OFFLINE) == 0);
-       } else if ((spc->spc_flags & SPCF_OFFLINE) == 0) {
-               /* If was not set offline, then it is busy */
-               return EBUSY;
+               ncpuonline++;
+       } else {
+               if ((spc->spc_flags & SPCF_OFFLINE) == 0) {
+                       /* If was not set offline, then it is busy */
+                       return EBUSY;
+               }
+               ncpuonline--;
        }
 
        spc->spc_lastmod = time_second;