patch-2.3.18 linux/include/asm-sparc/spinlock.h

• Lines: 67
• Date: Wed Sep 8 12:02:38 1999
• Orig file: v2.3.17/linux/include/asm-sparc/spinlock.h
• Orig date: Tue Aug 31 17:29:14 1999

diff -u --recursive --new-file v2.3.17/linux/include/asm-sparc/spinlock.h linux/include/asm-sparc/spinlock.h
@@ -10,57 +10,6 @@
 
 #ifndef __ASSEMBLY__
 
-#ifndef __SMP__
-
-typedef unsigned char spinlock_t;
-#define SPIN_LOCK_UNLOCKED 0
-
-#define spin_lock_init(lock)	do { } while(0)
-#define spin_lock(lock)		do { } while(0)
-#define spin_trylock(lock)	(1)
-#define spin_unlock_wait(lock)	do { } while(0)
-#define spin_unlock(lock)	do { } while(0)
-#define spin_lock_irq(lock)	cli()
-#define spin_unlock_irq(lock)	sti()
-#define spin_lock_bh(lock)	local_bh_disable()
-#define spin_unlock_bh(lock)	local_bh_enable()
-
-#define spin_lock_irqsave(lock, flags)		save_and_cli(flags)
-#define spin_unlock_irqrestore(lock, flags)	restore_flags(flags)
-
-/*
- * Read-write spinlocks, allowing multiple readers
- * but only one writer.
- *
- * NOTE! it is quite common to have readers in interrupts
- * but no interrupt writers. For those circumstances we
- * can "mix" irq-safe locks - any writer needs to get a
- * irq-safe write-lock, but readers can get non-irqsafe
- * read-locks.
- */
-typedef struct { volatile unsigned int lock; } rwlock_t;
-#define RW_LOCK_UNLOCKED (rwlock_t) { 0 }
-
-#define read_lock(lock)		do { } while(0)
-#define read_unlock(lock)	do { } while(0)
-#define write_lock(lock)	do { } while(0)
-#define write_unlock(lock)	do { } while(0)
-#define read_lock_irq(lock)	cli()
-#define read_unlock_irq(lock)	sti()
-#define write_lock_irq(lock)	cli()
-#define write_unlock_irq(lock)	sti()
-#define read_lock_bh(lock)	local_bh_disable()
-#define read_unlock_bh(lock)	local_bh_enable()
-#define write_lock_bh(lock)	local_bh_disable()
-#define write_unlock_bh(lock)	local_bh_enable()
-
-#define read_lock_irqsave(lock, flags)		save_and_cli(flags)
-#define read_unlock_irqrestore(lock, flags)	restore_flags(flags)
-#define write_lock_irqsave(lock, flags)		save_and_cli(flags)
-#define write_unlock_irqrestore(lock, flags)	restore_flags(flags)
-
-#else /* !(__SMP__) */
-
 #include <asm/psr.h>
 
 /* Define this to use the verbose/debugging versions in arch/sparc/lib/debuglocks.c */
@@ -370,8 +319,6 @@
 	do { write_unlock(lock); __restore_flags(flags); } while (0)
 
 #endif /* SPIN_LOCK_DEBUG */
-
-#endif /* __SMP__ */
 
 #endif /* !(__ASSEMBLY__) */