summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjasone <jasone@FreeBSD.org>2000-10-04 01:21:58 +0000
committerjasone <jasone@FreeBSD.org>2000-10-04 01:21:58 +0000
commitbea51a4aa1bf67a183bd1d4a6227fa891345af60 (patch)
tree02d5d1b6cff185ad962a80586c28fc424cbc31e9
parentaa773d53627041a051899b9eec6201238842e55c (diff)
downloadFreeBSD-src-bea51a4aa1bf67a183bd1d4a6227fa891345af60.zip
FreeBSD-src-bea51a4aa1bf67a183bd1d4a6227fa891345af60.tar.gz
Reduce userland namespace polution.
-rw-r--r--sys/alpha/include/mutex.h5
-rw-r--r--sys/amd64/include/mutex.h5
-rw-r--r--sys/i386/include/mutex.h5
-rw-r--r--sys/powerpc/include/mutex.h5
4 files changed, 16 insertions, 4 deletions
diff --git a/sys/alpha/include/mutex.h b/sys/alpha/include/mutex.h
index a8cc2d2..12b12a8 100644
--- a/sys/alpha/include/mutex.h
+++ b/sys/alpha/include/mutex.h
@@ -33,10 +33,11 @@
#define _MACHINE_MUTEX_H_
#ifndef LOCORE
+#include <sys/queue.h>
+#ifdef _KERNEL
#include <sys/ktr.h>
#include <sys/proc.h> /* Needed for curproc. */
-#include <sys/queue.h>
#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/globaldata.h>
@@ -77,6 +78,8 @@
#define MTX_FLAGMASK ~(MTX_RECURSE | MTX_CONTESTED)
#define MTX_UNOWNED 0x8 /* Cookie for free mutex */
+#endif /* _KERNEL */
+
/*
* Sleep/spin mutex
*/
diff --git a/sys/amd64/include/mutex.h b/sys/amd64/include/mutex.h
index 1bbe0e0..ca518d9 100644
--- a/sys/amd64/include/mutex.h
+++ b/sys/amd64/include/mutex.h
@@ -33,10 +33,11 @@
#define _MACHINE_MUTEX_H_
#ifndef LOCORE
+#include <sys/queue.h>
+#ifdef _KERNEL
#include <sys/ktr.h>
#include <sys/proc.h> /* Needed for curproc. */
-#include <sys/queue.h>
#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/globals.h>
@@ -76,6 +77,8 @@
#define MTX_FLAGMASK ~(MTX_RECURSE | MTX_CONTESTED)
#define MTX_UNOWNED 0x8 /* Cookie for free mutex */
+#endif /* _KERNEL */
+
/*
* Sleep/spin mutex
*/
diff --git a/sys/i386/include/mutex.h b/sys/i386/include/mutex.h
index 1bbe0e0..ca518d9 100644
--- a/sys/i386/include/mutex.h
+++ b/sys/i386/include/mutex.h
@@ -33,10 +33,11 @@
#define _MACHINE_MUTEX_H_
#ifndef LOCORE
+#include <sys/queue.h>
+#ifdef _KERNEL
#include <sys/ktr.h>
#include <sys/proc.h> /* Needed for curproc. */
-#include <sys/queue.h>
#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/globals.h>
@@ -76,6 +77,8 @@
#define MTX_FLAGMASK ~(MTX_RECURSE | MTX_CONTESTED)
#define MTX_UNOWNED 0x8 /* Cookie for free mutex */
+#endif /* _KERNEL */
+
/*
* Sleep/spin mutex
*/
diff --git a/sys/powerpc/include/mutex.h b/sys/powerpc/include/mutex.h
index a8cc2d2..12b12a8 100644
--- a/sys/powerpc/include/mutex.h
+++ b/sys/powerpc/include/mutex.h
@@ -33,10 +33,11 @@
#define _MACHINE_MUTEX_H_
#ifndef LOCORE
+#include <sys/queue.h>
+#ifdef _KERNEL
#include <sys/ktr.h>
#include <sys/proc.h> /* Needed for curproc. */
-#include <sys/queue.h>
#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/globaldata.h>
@@ -77,6 +78,8 @@
#define MTX_FLAGMASK ~(MTX_RECURSE | MTX_CONTESTED)
#define MTX_UNOWNED 0x8 /* Cookie for free mutex */
+#endif /* _KERNEL */
+
/*
* Sleep/spin mutex
*/
OpenPOWER on IntegriCloud