[src/trunk]: src/sys/rump/librump/rumpkern Make kpreempt_disabled() always re...

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

details:   https://anonhg.NetBSD.org/src/rev/146765bf3759
branches:  trunk
changeset: 329761:146765bf3759
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sat Jun 07 11:08:09 2014 +0000

description:
Make kpreempt_disabled() always return true in RUMP kernels for now.
May revisit once RUMP provides better splfoo/splx() handling.

diffstat:

 sys/rump/librump/rumpkern/scheduler.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 994f79ca61cd -r 146765bf3759 sys/rump/librump/rumpkern/scheduler.c
--- a/sys/rump/librump/rumpkern/scheduler.c     Sat Jun 07 11:00:29 2014 +0000
+++ b/sys/rump/librump/rumpkern/scheduler.c     Sat Jun 07 11:08:09 2014 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: scheduler.c,v 1.38 2014/06/05 23:43:04 rmind Exp $    */
+/*      $NetBSD: scheduler.c,v 1.39 2014/06/07 11:08:09 rmind Exp $    */
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.38 2014/06/05 23:43:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.39 2014/06/07 11:08:09 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -526,10 +526,14 @@
 bool
 kpreempt_disabled(void)
 {
+#if 0
        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 || cpu_kpreempt_disabled();
+#endif
+       /* XXX: emulate cpu_kpreempt_disabled() */
+       return true;
 }
 
 void