Module Name: src
Committed By: christos
Date: Sun Jun 3 14:56:52 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: mutex.h
Log Message:
The native mutex.h has a userland visible portion. make it so and fix the
build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/mutex.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/mutex.h
diff -u src/external/cddl/osnet/sys/sys/mutex.h:1.4 src/external/cddl/osnet/sys/sys/mutex.h:1.5
--- src/external/cddl/osnet/sys/sys/mutex.h:1.4 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/mutex.h Sun Jun 3 10:56:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.4 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: mutex.h,v 1.5 2018/06/03 14:56:52 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -32,10 +32,10 @@
#ifndef _OPENSOLARIS_SYS_MUTEX_H_
#define _OPENSOLARIS_SYS_MUTEX_H_
-#ifdef _KERNEL
-
#include_next <sys/mutex.h>
+#ifdef _KERNEL
+
#define MUTEX_HELD(x) (mutex_owned(x))
#define MUTEX_NOT_HELD(x) (!mutex_owned(x) || panicstr != NULL)
#define mutex_init(a, b, c, d) mutex_init(a, MUTEX_DEFAULT, IPL_NONE)
