Module Name: src
Committed By: uebayasi
Date: Fri Nov 28 08:27:27 UTC 2014
Modified Files:
src/sys/kern: kern_mutex.c
Log Message:
Consistently use KPREEMPT_*() here.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/kern/kern_mutex.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_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.60 src/sys/kern/kern_mutex.c:1.61
--- src/sys/kern/kern_mutex.c:1.60 Fri Sep 19 17:52:43 2014
+++ src/sys/kern/kern_mutex.c Fri Nov 28 08:27:27 2014
@@ -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 @@ mutex_vector_enter(kmutex_t *mtx)
continue;
}
if (__predict_false(panicstr != NULL)) {
- kpreempt_enable();
+ KPREEMPT_ENABLE(curlwp);
return;
}
if (__predict_false(MUTEX_OWNER(owner) == curthread)) {
