patch-2.4.4 linux/include/asm-sparc/semaphore.h

• Lines: 210
• Date: Tue Apr 17 17:19:31 2001
• Orig file: v2.4.3/linux/include/asm-sparc/semaphore.h
• Orig date: Sun Mar 25 18:14:21 2001

diff -u --recursive --new-file v2.4.3/linux/include/asm-sparc/semaphore.h linux/include/asm-sparc/semaphore.h
@@ -7,6 +7,7 @@
 
 #include <asm/atomic.h>
 #include <linux/wait.h>
+#include <linux/rwsem.h>
 
 struct semaphore {
 	atomic_t count;
@@ -207,201 +208,6 @@
 	: "0" (increment), "r" (ptr), "i" (__up)
 	: "g3", "g4", "g7", "memory", "cc");
 }	
-
-/* rw mutexes (should that be mutices? =) -- throw rw
- * spinlocks and semaphores together, and this is what we
- * end up with...
- *
- * The lock is initialized to BIAS.  This way, a writer
- * subtracts BIAS ands gets 0 for the case of an uncontended
- * lock.  Readers decrement by 1 and see a positive value
- * when uncontended, negative if there are writers waiting
- * (in which case it goes to sleep).
- *
- * The value 0x01000000 supports up to 128 processors and
- * lots of processes.  BIAS must be chosen such that subtracting
- * BIAS once per CPU will result in the int remaining
- * negative.
- * In terms of fairness, this should result in the lock
- * flopping back and forth between readers and writers
- * under heavy use.
- *
- *	      -ben
- */
-#define RW_LOCK_BIAS		0x01000000
-
-struct rw_semaphore {
-	int			count;
-	unsigned char		lock;
-	unsigned char		read_not_granted;
-	unsigned char		write_not_granted;
-	wait_queue_head_t	wait;
-	wait_queue_head_t	write_bias_wait;
-#if WAITQUEUE_DEBUG
-	long			__magic;
-	atomic_t		readers;
-	atomic_t		writers;
-#endif
-};
-
-#if WAITQUEUE_DEBUG
-#define __RWSEM_DEBUG_INIT	, ATOMIC_INIT(0), ATOMIC_INIT(0)
-#else
-#define __RWSEM_DEBUG_INIT	/* */
-#endif
-
-#define __RWSEM_INITIALIZER(name,count) \
-{ (count), 0, 0xff, 0xff, __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \
-  __WAIT_QUEUE_HEAD_INITIALIZER((name).write_bias_wait) \
-  __SEM_DEBUG_INIT(name) __RWSEM_DEBUG_INIT }
-
-#define __DECLARE_RWSEM_GENERIC(name,count) \
-	struct rw_semaphore name = __RWSEM_INITIALIZER(name,count)
-
-#define DECLARE_RWSEM(name) __DECLARE_RWSEM_GENERIC(name,RW_LOCK_BIAS)
-#define DECLARE_RWSEM_READ_LOCKED(name) __DECLARE_RWSEM_GENERIC(name,RW_LOCK_BIAS-1)
-#define DECLARE_RWSEM_WRITE_LOCKED(name) __DECLARE_RWSEM_GENERIC(name,0)
-
-static inline void init_rwsem(struct rw_semaphore *sem)
-{
-	sem->count = RW_LOCK_BIAS;
-	sem->lock = 0;
-	sem->read_not_granted = 0xff;
-	sem->write_not_granted = 0xff;
-	init_waitqueue_head(&sem->wait);
-	init_waitqueue_head(&sem->write_bias_wait);
-#if WAITQUEUE_DEBUG
-	sem->__magic = (long)&sem->__magic;
-	atomic_set(&sem->readers, 0);
-	atomic_set(&sem->writers, 0);
-#endif
-}
-
-extern void ___down_read(/* Special calling convention */ void);
-extern void ___down_write(/* Special calling convention */ void);
-extern void ___up_read(/* Special calling convention */ void);
-extern void ___up_write(/* Special calling convention */ void);
-
-static inline void down_read(struct rw_semaphore *sem)
-{
-	register volatile int *ptr asm("g1");
-
-#if WAITQUEUE_DEBUG
-	CHECK_MAGIC(sem->__magic);
-#endif
-
-	ptr = &sem->count;
-
-	__asm__ __volatile__("
-	mov	%%o7, %%g4
-	call	%1
-	 add	%%o7, 8, %%o7
-	"
-	:: "r" (ptr), "i" (___down_read)
-	: "g2", "g3", "g4", "g7", "memory", "cc");
-#if WAITQUEUE_DEBUG
-	if (!sem->write_not_granted)
-		BUG();
-	if (atomic_read(&sem->writers))
-		BUG();
-	atomic_inc(&sem->readers);
-#endif
-}
-
-static inline void down_write(struct rw_semaphore *sem)
-{
-	register volatile int *ptr asm("g1");
-
-#if WAITQUEUE_DEBUG
-	CHECK_MAGIC(sem->__magic);
-#endif
-
-	ptr = &sem->count;
-
-	__asm__ __volatile__("
-	mov	%%o7, %%g4
-	call	%1
-	 add	%%o7, 8, %%o7
-	"
-	:: "r" (ptr), "i" (___down_write)
-	: "g2", "g3", "g4", "g7", "memory", "cc");
-#if WAITQUEUE_DEBUG
-	if (atomic_read(&sem->writers))
-		BUG();
-	if (atomic_read(&sem->readers))
-		BUG();
-	if (!sem->read_not_granted)
-		BUG();
-	if (!sem->write_not_granted)
-		BUG();
-	atomic_inc(&sem->writers);
-#endif
-}
-
-/* When a reader does a release, the only significant
- * case is when there was a writer waiting, and we've
- * bumped the count to 0: we must wake the writer up.
- */
-static inline void __up_read(struct rw_semaphore *sem)
-{
-	register volatile int *ptr asm("g1");
-
-	ptr = &sem->count;
-
-	__asm__ __volatile__("
-	mov	%%o7, %%g4
-	call	%1
-	 add	%%o7, 8, %%o7
-	"
-	:: "r" (ptr), "i" (___up_read)
-	: "g2", "g3", "g4", "g7", "memory", "cc");
-}
-
-/* releasing the writer is easy -- just release it and
- * wake up any sleepers.
- */
-static inline void __up_write(struct rw_semaphore *sem)
-{
-	register volatile int *ptr asm("g1");
-
-	ptr = &sem->count;
-
-	__asm__ __volatile__("
-	mov	%%o7, %%g4
-	call	%1
-	 add	%%o7, 8, %%o7
-	"
-	:: "r" (ptr), "i" (___up_write)
-	: "g2", "g3", "g4", "g7", "memory", "cc");
-}
-
-static inline void up_read(struct rw_semaphore *sem)
-{
-#if WAITQUEUE_DEBUG
-	if (!sem->write_not_granted)
-		BUG();
-	if (atomic_read(&sem->writers))
-		BUG();
-	atomic_dec(&sem->readers);
-#endif
-	__up_read(sem);
-}
-
-static inline void up_write(struct rw_semaphore *sem)
-{
-#if WAITQUEUE_DEBUG
-	if (!sem->read_not_granted)
-		BUG();
-	if (!sem->write_not_granted)
-		BUG();
-	if (atomic_read(&sem->readers))
-		BUG();
-	if (atomic_read(&sem->writers) != 1)
-		BUG();
-	atomic_dec(&sem->writers);
-#endif
-	__up_write(sem);
-}
 
 #endif /* __KERNEL__ */