Module Name: src
Committed By: mlelstv
Date: Wed Nov 28 19:36:43 UTC 2018
Modified Files:
src/sys/kern: kern_synch.c
Log Message:
Revert previous for a better fix.
To generate a diff of this commit:
cvs rdiff -u -r1.319 -r1.320 src/sys/kern/kern_synch.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/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.319 src/sys/kern/kern_synch.c:1.320
--- src/sys/kern/kern_synch.c:1.319 Wed Nov 28 09:44:49 2018
+++ src/sys/kern/kern_synch.c Wed Nov 28 19:36:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.319 2018/11/28 09:44:49 mlelstv Exp $ */
+/* $NetBSD: kern_synch.c,v 1.320 2018/11/28 19:36:43 mlelstv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.319 2018/11/28 09:44:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.320 2018/11/28 19:36:43 mlelstv Exp $");
#include "opt_kstack.h"
#include "opt_dtrace.h"
@@ -292,12 +292,7 @@ preempt(void)
KASSERT(l->l_stat == LSONPROC);
l->l_kpriority = false;
l->l_nivcsw++;
- if (mi_switch(l) == 0) {
- /* we didn't switch */
- lwp_lock(l);
- l->l_nivcsw--;
- lwp_unlock(l);
- }
+ (void)mi_switch(l);
KERNEL_LOCK(l->l_biglocks, l);
}
