Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c8ed640 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas 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: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: default avatarDavid Miller <davem@davemloft.net>
Cc: Chris Zankel <chris@zankel.net>
LKML-Reference: <20110126195833.679641914@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bde11efb

arch/alpha/include/asm/rwsem.h

+0 −8
Original line number Diff line number Diff line
@@ -19,20 +19,12 @@ extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem); 
extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *);

extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);



/*

 * the semaphore definition

 */

struct rw_semaphore {

	long			count;

#define RWSEM_UNLOCKED_VALUE		0x0000000000000000L

#define RWSEM_ACTIVE_BIAS		0x0000000000000001L

#define RWSEM_ACTIVE_MASK		0x00000000ffffffffL

#define RWSEM_WAITING_BIAS		(-0x0000000100000000L)

#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)

	spinlock_t		wait_lock;

	struct list_head	wait_list;

};



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock),	\

arch/ia64/include/asm/rwsem.h

+0 −9
Original line number Diff line number Diff line
@@ -27,15 +27,6 @@ 


#include <asm/intrinsics.h>



/*

 * the semaphore definition

 */

struct rw_semaphore {

	signed long		count;

	spinlock_t		wait_lock;

	struct list_head	wait_list;

};



#define RWSEM_UNLOCKED_VALUE		__IA64_UL_CONST(0x0000000000000000)

#define RWSEM_ACTIVE_BIAS		(1L)

#define RWSEM_ACTIVE_MASK		(0xffffffffL)

arch/powerpc/include/asm/rwsem.h

+0 −9
Original line number Diff line number Diff line
@@ -28,15 +28,6 @@ 
#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)



struct rw_semaphore {

	long			count;

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lockdep_map	dep_map;

#endif

};



#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }

#else

arch/s390/include/asm/rwsem.h

+0 −12
Original line number Diff line number Diff line
@@ -49,18 +49,6 @@ extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *); 
extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *);

extern struct rw_semaphore *rwsem_downgrade_write(struct rw_semaphore *);



/*

 * the semaphore definition

 */

struct rw_semaphore {

	signed long		count;

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lockdep_map	dep_map;

#endif

};



#ifndef __s390x__

#define RWSEM_UNLOCKED_VALUE	0x00000000

#define RWSEM_ACTIVE_BIAS	0x00000001

arch/sh/include/asm/rwsem.h

+1 −11
Original line number Diff line number Diff line
@@ -11,23 +11,13 @@ 
#endif



#ifdef __KERNEL__

/*

 * the semaphore definition

 */

struct rw_semaphore {

	long		count;



#define RWSEM_UNLOCKED_VALUE		0x00000000

#define RWSEM_ACTIVE_BIAS		0x00000001

#define RWSEM_ACTIVE_MASK		0x0000ffff

#define RWSEM_WAITING_BIAS		(-0x00010000)

#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lockdep_map	dep_map;

#endif

};



#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }