[src/netbsd-8]: src/sys/arch/mips/mips Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/ec7255346350
branches:  netbsd-8
changeset: 434850:ec7255346350
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Apr 09 13:29:01 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #722):
        sys/arch/mips/mips/cpu_subr.c: revision 1.33
spl leak, found by mootja

diffstat:

 sys/arch/mips/mips/cpu_subr.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r eb869464cb3c -r ec7255346350 sys/arch/mips/mips/cpu_subr.c
--- a/sys/arch/mips/mips/cpu_subr.c     Mon Apr 09 13:27:42 2018 +0000
+++ b/sys/arch/mips/mips/cpu_subr.c     Mon Apr 09 13:29:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.32 2017/05/07 04:14:20 skrll Exp $      */
+/*     $NetBSD: cpu_subr.c,v 1.32.2.1 2018/04/09 13:29:01 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.32 2017/05/07 04:14:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.32.2.1 2018/04/09 13:29:01 bouyer Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -771,8 +771,10 @@
        int s = splhigh();
        cpuid_t cii = cpu_index(curcpu());
 
-       if (__predict_false(cold))
+       if (__predict_false(cold)) {
+               splx(s);
                return;
+       }
 
        do {
                kcpuset_atomic_set(cpus_paused, cii);