Commit fc47e7b5 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by Linus Torvalds
Browse files

[PATCH] lockdep ifdef fix 



With

	CONFIG_SMP=y
	CONFIG_PREEMPT=y
	CONFIG_LOCKDEP=y
	CONFIG_DEBUG_LOCK_ALLOC=y
	# CONFIG_PROVE_LOCKING is not set

spin_unlock_irqrestore() goes through lockdep but spin_lock_irqsave() doesn't.
Apparently, bad things happen.

Acked-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 c336923b

kernel/spinlock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ EXPORT_SYMBOL(_write_trylock); 
 * not re-enabled during lock-acquire (which the preempt-spin-ops do):

 * not re-enabled during lock-acquire (which the preempt-spin-ops do):

 */

 */

#if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \

#if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \

	defined(CONFIG_PROVE_LOCKING)

	defined(CONFIG_DEBUG_LOCK_ALLOC)





void __lockfunc _read_lock(rwlock_t *lock)

void __lockfunc _read_lock(rwlock_t *lock)

{

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE