Module Name: src
Committed By: bouyer
Date: Mon Apr 9 13:29:01 UTC 2018
Modified Files:
src/sys/arch/mips/mips [netbsd-8]: cpu_subr.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/arch/mips/mips/cpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.32 src/sys/arch/mips/mips/cpu_subr.c:1.32.2.1
--- src/sys/arch/mips/mips/cpu_subr.c:1.32 Sun May 7 04:14:20 2017
+++ src/sys/arch/mips/mips/cpu_subr.c Mon Apr 9 13:29:01 2018
@@ -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 @@ cpu_pause(struct reg *regsp)
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);
