patch-2.3.7 linux/include/asm-arm/semaphore.h

• Lines: 55
• Date: Thu Jun 17 01:11:35 1999
• Orig file: v2.3.6/linux/include/asm-arm/semaphore.h
• Orig date: Sat May 15 15:05:37 1999

diff -u --recursive --new-file v2.3.6/linux/include/asm-arm/semaphore.h linux/include/asm-arm/semaphore.h
@@ -6,6 +6,7 @@
 
 #include <linux/linkage.h>
 #include <asm/atomic.h>
+#include <linux/wait.h>
 
 struct semaphore {
 	atomic_t count;
@@ -13,8 +14,35 @@
 	wait_queue_head_t wait;
 };
 
-#define MUTEX ((struct semaphore) { ATOMIC_INIT(1), 0, NULL })
-#define MUTEX_LOCKED ((struct semaphore) { ATOMIC_INIT(0), 0, NULL })
+#define __SEMAPHORE_INIT(name,count)			\
+	{ ATOMIC_INIT(count), 0,			\
+	  __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) }
+
+#define __MUTEX_INITIALIZER(name) \
+	__SEMAPHORE_INIT(name,1)
+
+#define __DECLARE_SEMAPHORE_GENERIC(name,count)	\
+	struct semaphore name = __SEMAPHORE_INIT(name,count)
+
+#define DECLARE_MUTEX(name)		__DECLARE_SEMAPHORE_GENERIC(name,1)
+#define DECLARE_MUTEX_LOCKED(name)	__DECLARE_SEMAPHORE_GENERIC(name,0)
+
+#define sema_init(sem, val)			\
+do {						\
+	atomic_set(&((sem)->count), (val));	\
+	(sem)->waking = 0;			\
+	init_waitqueue_head(&(sem)->wait);	\
+} while (0)
+
+static inline void init_MUTEX(struct semaphore *sem)
+{
+	sema_init(sem, 1);
+}
+
+static inline void init_MUTEX_LOCKED(struct semaphore *sem)
+{
+	sema_init(sem, 0);
+}
 
 asmlinkage void __down_failed (void /* special register calling convention */);
 asmlinkage int  __down_interruptible_failed (void /* special register calling convention */);
@@ -26,7 +54,7 @@
 extern int  __down_trylock(struct semaphore * sem);
 extern void __up(struct semaphore * sem);
 
-#define sema_init(sem, val)	atomic_set(&((sem)->count), (val))
+extern spinlock_t semaphore_wake_lock;
 
 #include <asm/proc/semaphore.h>