include files which are used by userland cannot include other files..

which are not installed to userland; ok drahn

4 files changed, 5 insertions, 66 deletions

diff --git a/sys/arch/arm/xscale/i80321_mutex.h b/sys/arch/arm/include/mutex.h
index 2334d61d39f..87e0f873060 100644
--- a/sys/arch/arm/xscale/i80321_mutex.h
+++ b/sys/arch/arm/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i80321_mutex.h,v 1.1 2007/05/15 05:26:44 miod Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.1 2007/12/05 16:08:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
diff --git a/sys/arch/arm/xscale/pxa2x0_mutex.h b/sys/arch/arm/xscale/pxa2x0_mutex.h
deleted file mode 100644
index afe348dd86a..00000000000
--- a/sys/arch/arm/xscale/pxa2x0_mutex.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$OpenBSD: pxa2x0_mutex.h,v 1.1 2007/05/15 05:26:44 miod Exp $	*/
-
-/*
- * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef _MACHINE_MUTEX_H_
-#define _MACHINE_MUTEX_H_
-
-/*
- * Simple non-mp implementation.
- */
-struct mutex {
-	int mtx_lock;
-	int mtx_wantipl;
-	int mtx_oldipl;
-};
-
-void mtx_init(struct mutex *, int);
-
-#define MUTEX_INITIALIZER(ipl) { 0, ipl, 0 }
-
-#ifdef DIAGNOSTIC
-#define MUTEX_ASSERT_LOCKED(mtx) do {					\
-	if ((mtx)->mtx_lock == 0)					\
-		panic("mutex %p not held in %s", (mtx), __func__);	\
-} while (0)
-
-#define MUTEX_ASSERT_UNLOCKED(mtx) do {					\
-	if ((mtx)->mtx_lock != 0)					\
-		panic("mutex %p held in %s", (mtx), __func__);		\
-} while (0)
-#else
-#define MUTEX_ASSERT_LOCKED(mtx) do { } while (0)
-#define MUTEX_ASSERT_UNLOCKED(mtx) do { } while (0)
-#endif
-
-#define MUTEX_OLDIPL(mtx)	(mtx)->mtx_oldipl
-
-#endif
diff --git a/sys/arch/armish/include/mutex.h b/sys/arch/armish/include/mutex.h
index 11c58b359af..8f734b03a83 100644
--- a/sys/arch/armish/include/mutex.h
+++ b/sys/arch/armish/include/mutex.h
@@ -1,3 +1,3 @@
-/*	$OpenBSD: mutex.h,v 1.1 2007/05/15 05:26:44 miod Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.2 2007/12/05 16:08:06 deraadt Exp $	*/
 /* public domain */
-#include <arm/xscale/i80321_mutex.h>
+#include <arm/mutex.h>
diff --git a/sys/arch/zaurus/include/mutex.h b/sys/arch/zaurus/include/mutex.h
index ee9afd9e522..8f734b03a83 100644
--- a/sys/arch/zaurus/include/mutex.h
+++ b/sys/arch/zaurus/include/mutex.h
@@ -1,3 +1,3 @@
-/*	$OpenBSD: mutex.h,v 1.1 2007/05/15 05:26:45 miod Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.2 2007/12/05 16:08:06 deraadt Exp $	*/
 /* public domain */
-#include <arm/xscale/pxa2x0_mutex.h>
+#include <arm/mutex.h>