Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit fc47e7b592dc45b03c27b0a4c8f2d215dae9944d

Authored by Jarek Poplawski
Committed by Linus Torvalds
1 parent c336923b66
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -72,7 +72,7 @@
72 72 * not re-enabled during lock-acquire (which the preempt-spin-ops do):
73 73 */
74 74 #if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \
75   - defined(CONFIG_PROVE_LOCKING)
  75 + defined(CONFIG_DEBUG_LOCK_ALLOC)
76 76  
77 77 void __lockfunc _read_lock(rwlock_t *lock)
78 78 {