Commit 9f50b93f authored by Josh Triplett's avatar Josh Triplett Committed by Linus Torvalds
Browse files

[PATCH] Make spinlock/rwlock annotations more accurate by using parameters, not types 



The lock annotations used on spinlocks and rwlocks currently use
__{acquires,releases}(spinlock_t) and __{acquires,releases}(rwlock_t),
respectively.  This loses the information of which lock actually got
acquired or released, and assumes a different type for the parameter of
__acquires and __releases than the rest of the kernel.  While the current
implementations of __acquires and __releases throw away their argument,
this will not always remain the case.  Change this to use the lock
parameter instead, to preserve this information and increase consistency in
usage of __acquires and __releases.

Signed-off-by: default avatarJosh Triplett <josh@freedesktop.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 92e9a850

include/linux/spinlock_api_smp.h

+25 −25
Original line number Diff line number Diff line
@@ -19,41 +19,41 @@ int in_lock_functions(unsigned long addr); 


#define assert_spin_locked(x)	BUG_ON(!spin_is_locked(x))



void __lockfunc _spin_lock(spinlock_t *lock)		__acquires(spinlock_t);

void __lockfunc _spin_lock(spinlock_t *lock)		__acquires(lock);

void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)

							__acquires(spinlock_t);

void __lockfunc _read_lock(rwlock_t *lock)		__acquires(rwlock_t);

void __lockfunc _write_lock(rwlock_t *lock)		__acquires(rwlock_t);

void __lockfunc _spin_lock_bh(spinlock_t *lock)		__acquires(spinlock_t);

void __lockfunc _read_lock_bh(rwlock_t *lock)		__acquires(rwlock_t);

void __lockfunc _write_lock_bh(rwlock_t *lock)		__acquires(rwlock_t);

void __lockfunc _spin_lock_irq(spinlock_t *lock)	__acquires(spinlock_t);

void __lockfunc _read_lock_irq(rwlock_t *lock)		__acquires(rwlock_t);

void __lockfunc _write_lock_irq(rwlock_t *lock)		__acquires(rwlock_t);

							__acquires(lock);

void __lockfunc _read_lock(rwlock_t *lock)		__acquires(lock);

void __lockfunc _write_lock(rwlock_t *lock)		__acquires(lock);

void __lockfunc _spin_lock_bh(spinlock_t *lock)		__acquires(lock);

void __lockfunc _read_lock_bh(rwlock_t *lock)		__acquires(lock);

void __lockfunc _write_lock_bh(rwlock_t *lock)		__acquires(lock);

void __lockfunc _spin_lock_irq(spinlock_t *lock)	__acquires(lock);

void __lockfunc _read_lock_irq(rwlock_t *lock)		__acquires(lock);

void __lockfunc _write_lock_irq(rwlock_t *lock)		__acquires(lock);

unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)

							__acquires(spinlock_t);

							__acquires(lock);

unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)

							__acquires(rwlock_t);

							__acquires(lock);

unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)

							__acquires(rwlock_t);

							__acquires(lock);

int __lockfunc _spin_trylock(spinlock_t *lock);

int __lockfunc _read_trylock(rwlock_t *lock);

int __lockfunc _write_trylock(rwlock_t *lock);

int __lockfunc _spin_trylock_bh(spinlock_t *lock);

void __lockfunc _spin_unlock(spinlock_t *lock)		__releases(spinlock_t);

void __lockfunc _read_unlock(rwlock_t *lock)		__releases(rwlock_t);

void __lockfunc _write_unlock(rwlock_t *lock)		__releases(rwlock_t);

void __lockfunc _spin_unlock_bh(spinlock_t *lock)	__releases(spinlock_t);

void __lockfunc _read_unlock_bh(rwlock_t *lock)		__releases(rwlock_t);

void __lockfunc _write_unlock_bh(rwlock_t *lock)	__releases(rwlock_t);

void __lockfunc _spin_unlock_irq(spinlock_t *lock)	__releases(spinlock_t);

void __lockfunc _read_unlock_irq(rwlock_t *lock)	__releases(rwlock_t);

void __lockfunc _write_unlock_irq(rwlock_t *lock)	__releases(rwlock_t);

void __lockfunc _spin_unlock(spinlock_t *lock)		__releases(lock);

void __lockfunc _read_unlock(rwlock_t *lock)		__releases(lock);

void __lockfunc _write_unlock(rwlock_t *lock)		__releases(lock);

void __lockfunc _spin_unlock_bh(spinlock_t *lock)	__releases(lock);

void __lockfunc _read_unlock_bh(rwlock_t *lock)		__releases(lock);

void __lockfunc _write_unlock_bh(rwlock_t *lock)	__releases(lock);

void __lockfunc _spin_unlock_irq(spinlock_t *lock)	__releases(lock);

void __lockfunc _read_unlock_irq(rwlock_t *lock)	__releases(lock);

void __lockfunc _write_unlock_irq(rwlock_t *lock)	__releases(lock);

void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags)

							__releases(spinlock_t);

							__releases(lock);

void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(rwlock_t);

							__releases(lock);

void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(rwlock_t);

							__releases(lock);



#endif /* __LINUX_SPINLOCK_API_SMP_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE