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

Commit 61f4c3d6 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: remove RWSEM_DEBUG remnants 



RWSEM_DEBUG used to be a printk based 'tracing' facility, probably used for
very early prototypes of the rwsem code.  Remove it.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c4e05116

include/asm-alpha/rwsem.h

+1 −13
Original line number Diff line number Diff line
@@ -36,20 +36,11 @@ struct rw_semaphore { 
#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#if RWSEM_DEBUG

	int			debug;

#endif

};



#if RWSEM_DEBUG

#define __RWSEM_DEBUG_INIT      , 0

#else

#define __RWSEM_DEBUG_INIT	/* */

#endif



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \

	LIST_HEAD_INIT((name).wait_list) __RWSEM_DEBUG_INIT }

	LIST_HEAD_INIT((name).wait_list) }



#define DECLARE_RWSEM(name) \

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
@@ -59,9 +50,6 @@ static inline void init_rwsem(struct rw_semaphore *sem) 
	sem->count = RWSEM_UNLOCKED_VALUE;

	spin_lock_init(&sem->wait_lock);

	INIT_LIST_HEAD(&sem->wait_list);

#if RWSEM_DEBUG

	sem->debug = 0;

#endif

}



static inline void __down_read(struct rw_semaphore *sem)

include/asm-ia64/rwsem.h

+1 −17
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ struct rw_semaphore { 
	signed long		count;

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#if RWSEM_DEBUG

	int			debug;

#endif

};



#define RWSEM_UNLOCKED_VALUE		__IA64_UL_CONST(0x0000000000000000)
@@ -45,19 +42,9 @@ struct rw_semaphore { 
#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)



/*

 * initialization

 */

#if RWSEM_DEBUG

#define __RWSEM_DEBUG_INIT      , 0

#else

#define __RWSEM_DEBUG_INIT	/* */

#endif



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \

	  LIST_HEAD_INIT((name).wait_list) \

	  __RWSEM_DEBUG_INIT }

	  LIST_HEAD_INIT((name).wait_list) }



#define DECLARE_RWSEM(name) \

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
@@ -73,9 +60,6 @@ init_rwsem (struct rw_semaphore *sem) 
	sem->count = RWSEM_UNLOCKED_VALUE;

	spin_lock_init(&sem->wait_lock);

	INIT_LIST_HEAD(&sem->wait_list);

#if RWSEM_DEBUG

	sem->debug = 0;

#endif

}



/*

include/asm-powerpc/rwsem.h

+1 −17
Original line number Diff line number Diff line
@@ -28,24 +28,11 @@ struct rw_semaphore { 
#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#if RWSEM_DEBUG

	int			debug;

#endif

};



/*

 * initialisation

 */

#if RWSEM_DEBUG

#define __RWSEM_DEBUG_INIT      , 0

#else

#define __RWSEM_DEBUG_INIT	/* */

#endif



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \

	  LIST_HEAD_INIT((name).wait_list) \

	  __RWSEM_DEBUG_INIT }

	  LIST_HEAD_INIT((name).wait_list) }



#define DECLARE_RWSEM(name)		\

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
@@ -60,9 +47,6 @@ static inline void init_rwsem(struct rw_semaphore *sem) 
	sem->count = RWSEM_UNLOCKED_VALUE;

	spin_lock_init(&sem->wait_lock);

	INIT_LIST_HEAD(&sem->wait_list);

#if RWSEM_DEBUG

	sem->debug = 0;

#endif

}



/*

include/asm-sh/rwsem.h

+1 −17
Original line number Diff line number Diff line
@@ -25,24 +25,11 @@ struct rw_semaphore { 
#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#if RWSEM_DEBUG

	int			debug;

#endif

};



/*

 * initialisation

 */

#if RWSEM_DEBUG

#define __RWSEM_DEBUG_INIT      , 0

#else

#define __RWSEM_DEBUG_INIT	/* */

#endif



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \

	  LIST_HEAD_INIT((name).wait_list) \

	  __RWSEM_DEBUG_INIT }

	  LIST_HEAD_INIT((name).wait_list) }



#define DECLARE_RWSEM(name)		\

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
@@ -57,9 +44,6 @@ static inline void init_rwsem(struct rw_semaphore *sem) 
	sem->count = RWSEM_UNLOCKED_VALUE;

	spin_lock_init(&sem->wait_lock);

	INIT_LIST_HEAD(&sem->wait_list);

#if RWSEM_DEBUG

	sem->debug = 0;

#endif

}



/*

include/asm-xtensa/rwsem.h

+1 −17
Original line number Diff line number Diff line
@@ -31,24 +31,11 @@ struct rw_semaphore { 
#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#if RWSEM_DEBUG

	int			debug;

#endif

};



/*

 * initialisation

 */

#if RWSEM_DEBUG

#define __RWSEM_DEBUG_INIT      , 0

#else

#define __RWSEM_DEBUG_INIT	/* */

#endif



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \

	  LIST_HEAD_INIT((name).wait_list) \

	  __RWSEM_DEBUG_INIT }

	  LIST_HEAD_INIT((name).wait_list) }



#define DECLARE_RWSEM(name)		\

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
@@ -63,9 +50,6 @@ static inline void init_rwsem(struct rw_semaphore *sem) 
	sem->count = RWSEM_UNLOCKED_VALUE;

	spin_lock_init(&sem->wait_lock);

	INIT_LIST_HEAD(&sem->wait_list);

#if RWSEM_DEBUG

	sem->debug = 0;

#endif

}



/*