Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern kpreempt_disabled(): softint LWPs aren't preemptable.



details:   https://anonhg.NetBSD.org/src/rev/efa78b95607e
branches:  trunk
changeset: 967649:efa78b95607e
user:      ad <ad%NetBSD.org@localhost>
date:      Mon Dec 16 20:59:39 2019 +0000

description:
kpreempt_disabled(): softint LWPs aren't preemptable.

diffstat:

 sys/kern/kern_synch.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 49f7e454641d -r efa78b95607e sys/kern/kern_synch.c
--- a/sys/kern/kern_synch.c     Mon Dec 16 20:45:40 2019 +0000
+++ b/sys/kern/kern_synch.c     Mon Dec 16 20:59:39 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_synch.c,v 1.331 2019/12/07 21:14:36 ad Exp $      */
+/*     $NetBSD: kern_synch.c,v 1.332 2019/12/16 20:59:39 ad Exp $      */
 
 /*-
  * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.331 2019/12/07 21:14:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.332 2019/12/16 20:59:39 ad Exp $");
 
 #include "opt_kstack.h"
 #include "opt_dtrace.h"
@@ -422,7 +422,8 @@
        const lwp_t *l = curlwp;
 
        return l->l_nopreempt != 0 || l->l_stat == LSZOMB ||
-           (l->l_flag & LW_IDLE) != 0 || cpu_kpreempt_disabled();
+           (l->l_flag & LW_IDLE) != 0 || (l->l_pflag & LP_INTR) != 0 ||
+           cpu_kpreempt_disabled();
 }
 
 /*



Home | Main Index | Thread Index | Old Index