aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-01-26 15:05:56 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-01-27 06:30:39 -0500
commit1c8ed640d918290ddc1de5ada02ef6686a733c9f (patch)
treec824e72ff857b68d992fd7cc24810b472d030cd1 /arch/s390
parentbde11efbc21ea84c3351464a422b467eaefabb9a (diff)
rwsem: Move duplicate struct rwsem declaration to linux/rwsem.h
The difference between these declarations is the data type of the count member and the lack of lockdep in some architectures/ long is equivivalent to signed long and the #ifdef guarded dep_map member does not hurt anyone. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: David Howells <dhowells@redhat.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Matt Turner <mattst88@gmail.com> Acked-by: Tony Luck <tony.luck@intel.com> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Acked-by: David Miller <davem@davemloft.net> Cc: Chris Zankel <chris@zankel.net> LKML-Reference: <20110126195833.679641914@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/rwsem.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/s390/include/asm/rwsem.h b/arch/s390/include/asm/rwsem.h
index 9cc8592b33bb..6e075f1d97b4 100644
--- a/arch/s390/include/asm/rwsem.h
+++ b/arch/s390/include/asm/rwsem.h
@@ -49,18 +49,6 @@ extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *);
49extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *); 49extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *);
50extern struct rw_semaphore *rwsem_downgrade_write(struct rw_semaphore *); 50extern struct rw_semaphore *rwsem_downgrade_write(struct rw_semaphore *);
51 51
52/*
53 * the semaphore definition
54 */
55struct rw_semaphore {
56 signed long count;
57 spinlock_t wait_lock;
58 struct list_head wait_list;
59#ifdef CONFIG_DEBUG_LOCK_ALLOC
60 struct lockdep_map dep_map;
61#endif
62};
63
64#ifndef __s390x__ 52#ifndef __s390x__
65#define RWSEM_UNLOCKED_VALUE 0x00000000 53#define RWSEM_UNLOCKED_VALUE 0x00000000
66#define RWSEM_ACTIVE_BIAS 0x00000001 54#define RWSEM_ACTIVE_BIAS 0x00000001