[src/trunk]: src/sys/kern Consistently use KPREEMPT_*() here.

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

details:   https://anonhg.NetBSD.org/src/rev/65d43488abd5
branches:  trunk
changeset: 334042:65d43488abd5
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Nov 28 08:27:27 2014 +0000

description:
Consistently use KPREEMPT_*() here.

diffstat:

 sys/kern/kern_mutex.c  |  6 +++---
 sys/kern/kern_rwlock.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 8bf05f309fb2 -r 65d43488abd5 sys/kern/kern_mutex.c
--- a/sys/kern/kern_mutex.c     Fri Nov 28 08:03:46 2014 +0000
+++ b/sys/kern/kern_mutex.c     Fri Nov 28 08:27:27 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_mutex.c,v 1.60 2014/09/19 17:52:43 matt Exp $     */
+/*     $NetBSD: kern_mutex.c,v 1.61 2014/11/28 08:27:27 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #define        __MUTEX_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.60 2014/09/19 17:52:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.61 2014/11/28 08:27:27 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -534,7 +534,7 @@
                        continue;
                }
                if (__predict_false(panicstr != NULL)) {
-                       kpreempt_enable();
+                       KPREEMPT_ENABLE(curlwp);
                        return;
                }
                if (__predict_false(MUTEX_OWNER(owner) == curthread)) {
diff -r 8bf05f309fb2 -r 65d43488abd5 sys/kern/kern_rwlock.c
--- a/sys/kern/kern_rwlock.c    Fri Nov 28 08:03:46 2014 +0000
+++ b/sys/kern/kern_rwlock.c    Fri Nov 28 08:27:27 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_rwlock.c,v 1.44 2014/09/05 05:57:21 matt Exp $    */
+/*     $NetBSD: kern_rwlock.c,v 1.45 2014/11/28 08:28:17 uebayasi Exp $        */
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.44 2014/09/05 05:57:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.45 2014/11/28 08:28:17 uebayasi Exp $");
 
 #define        __RWLOCK_PRIVATE
 
@@ -334,7 +334,7 @@
                        continue;
                }
                if (__predict_false(panicstr != NULL)) {
-                       kpreempt_enable();
+                       KPREEMPT_ENABLE(curlwp);
                        return;
                }
                if (__predict_false(RW_OWNER(rw) == curthread)) {