Dummy mutex code for arm platforms. ok drahn@ deraadt@

3 files changed, 6 insertions, 51 deletions

diff --git a/sys/arch/zaurus/include/_types.h b/sys/arch/zaurus/include/_types.h
index 5e10865c9ae..7cf8cf0a351 100644
--- a/sys/arch/zaurus/include/_types.h
+++ b/sys/arch/zaurus/include/_types.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:10 millert Exp $	*/
+/* 	$OpenBSD: _types.h,v 1.2 2007/05/15 05:26:44 miod Exp $	*/
 
 #ifndef _ZAURUS__TYPES_H_
 #define	_ZAURUS__TYPES_H_
@@ -6,5 +6,6 @@
 #include <arm/_types.h>
 
 #define __HAVE_GENERIC_SOFT_INTERRUPTS
+#define	__HAVE_MUTEX
 
 #endif
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index 9a2f1322ff8..24fe0fb3e11 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.6 2006/05/31 18:01:07 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.7 2007/05/15 05:26:45 miod Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -77,50 +77,6 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-void	_setsoftintr(int);
-
-#else	/* _LKM */
-
-/*
- * Each board needs to define the following functions:
- *
- * int	_splraise(int);
- * int	_spllower(int);
- * void	splx(int);
- * void	_setsoftintr(int);
- *
- * These may be defined as functions, static __inline functions, or macros,
- * but there must be a _spllower() and splx() defined as functions callable
- * from assembly language (for cpu_switch()).  However, since it's quite
- * useful to be able to inline splx(), you could do something like the
- * following:
- *
- * in <boardtype>_intr.h:
- * 	static __inline int
- *	boardtype_splx(int spl)
- *	{...}
- *
- *	#define splx(nspl)	boardtype_splx(nspl)
- *	...
- * and in boardtype's machdep code:
- *
- *	...
- *	#undef splx
- *	int
- *	splx(int spl)
- *	{
- *		return boardtype_splx(spl);
- *	}
- */
-
-
-#endif /* _LKM */
-
 #define	splhigh()	_splraise(IPL_HIGH)
 #define	splsoft()	_splraise(IPL_SOFT)
 #define	splsoftclock()	_splraise(IPL_SOFTCLOCK)
@@ -139,15 +95,10 @@ void	_setsoftintr(int);
 #define	splsched()	splhigh()
 #define	spllock()	splhigh()
 
-/* Use generic software interrupt support. */
-#include <arm/softintr.h>
-
 #endif /* ! _LOCORE */
 
 #include <arm/xscale/pxa2x0_intr.h>
 
-#define splassert(wantipl) do { /* nada */ } while (0)
-
 #endif /* _KERNEL */
 
 #endif	/* _EVBARM_INTR_H_ */
diff --git a/sys/arch/zaurus/include/mutex.h b/sys/arch/zaurus/include/mutex.h
new file mode 100644
index 00000000000..ee9afd9e522
--- /dev/null
+++ b/sys/arch/zaurus/include/mutex.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: mutex.h,v 1.1 2007/05/15 05:26:45 miod Exp $	*/
+/* public domain */
+#include <arm/xscale/pxa2x0_mutex.h>