mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-05 22:12:16 +00:00
[PATCH] lockdep: clean up rwsems
Clean up rwsems. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
8b3db9c542
commit
c4e05116a2
6 changed files with 109 additions and 128 deletions
|
@ -9,8 +9,6 @@
|
|||
|
||||
#include <linux/linkage.h>
|
||||
|
||||
#define RWSEM_DEBUG 0
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/types.h>
|
||||
|
@ -26,23 +24,13 @@ struct rw_semaphore;
|
|||
#include <asm/rwsem.h> /* use an arch-specific implementation */
|
||||
#endif
|
||||
|
||||
#ifndef rwsemtrace
|
||||
#if RWSEM_DEBUG
|
||||
extern void FASTCALL(rwsemtrace(struct rw_semaphore *sem, const char *str));
|
||||
#else
|
||||
#define rwsemtrace(SEM,FMT)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* lock for reading
|
||||
*/
|
||||
static inline void down_read(struct rw_semaphore *sem)
|
||||
{
|
||||
might_sleep();
|
||||
rwsemtrace(sem,"Entering down_read");
|
||||
__down_read(sem);
|
||||
rwsemtrace(sem,"Leaving down_read");
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -51,9 +39,7 @@ static inline void down_read(struct rw_semaphore *sem)
|
|||
static inline int down_read_trylock(struct rw_semaphore *sem)
|
||||
{
|
||||
int ret;
|
||||
rwsemtrace(sem,"Entering down_read_trylock");
|
||||
ret = __down_read_trylock(sem);
|
||||
rwsemtrace(sem,"Leaving down_read_trylock");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -63,9 +49,7 @@ static inline int down_read_trylock(struct rw_semaphore *sem)
|
|||
static inline void down_write(struct rw_semaphore *sem)
|
||||
{
|
||||
might_sleep();
|
||||
rwsemtrace(sem,"Entering down_write");
|
||||
__down_write(sem);
|
||||
rwsemtrace(sem,"Leaving down_write");
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -74,9 +58,7 @@ static inline void down_write(struct rw_semaphore *sem)
|
|||
static inline int down_write_trylock(struct rw_semaphore *sem)
|
||||
{
|
||||
int ret;
|
||||
rwsemtrace(sem,"Entering down_write_trylock");
|
||||
ret = __down_write_trylock(sem);
|
||||
rwsemtrace(sem,"Leaving down_write_trylock");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -85,9 +67,7 @@ static inline int down_write_trylock(struct rw_semaphore *sem)
|
|||
*/
|
||||
static inline void up_read(struct rw_semaphore *sem)
|
||||
{
|
||||
rwsemtrace(sem,"Entering up_read");
|
||||
__up_read(sem);
|
||||
rwsemtrace(sem,"Leaving up_read");
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -95,9 +75,7 @@ static inline void up_read(struct rw_semaphore *sem)
|
|||
*/
|
||||
static inline void up_write(struct rw_semaphore *sem)
|
||||
{
|
||||
rwsemtrace(sem,"Entering up_write");
|
||||
__up_write(sem);
|
||||
rwsemtrace(sem,"Leaving up_write");
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -105,9 +83,7 @@ static inline void up_write(struct rw_semaphore *sem)
|
|||
*/
|
||||
static inline void downgrade_write(struct rw_semaphore *sem)
|
||||
{
|
||||
rwsemtrace(sem,"Entering downgrade_write");
|
||||
__downgrade_write(sem);
|
||||
rwsemtrace(sem,"Leaving downgrade_write");
|
||||
}
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue