diff options
| author | Jarek Poplawski <jarkao2@o2.pl> | 2006-09-06 03:03:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-06 14:00:01 -0400 |
| commit | fc47e7b592dc45b03c27b0a4c8f2d215dae9944d (patch) | |
| tree | 54ea55d491e2f708bc23655041668e19da3de619 | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
[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>
| -rw-r--r-- | kernel/spinlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/spinlock.c b/kernel/spinlock.c index bfd6ad9c0330..fb524b009eef 100644 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c | |||
| @@ -72,7 +72,7 @@ EXPORT_SYMBOL(_write_trylock); | |||
| 72 | * not re-enabled during lock-acquire (which the preempt-spin-ops do): | 72 | * not re-enabled during lock-acquire (which the preempt-spin-ops do): |
| 73 | */ | 73 | */ |
| 74 | #if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \ | 74 | #if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \ |
| 75 | defined(CONFIG_PROVE_LOCKING) | 75 | defined(CONFIG_DEBUG_LOCK_ALLOC) |
| 76 | 76 | ||
| 77 | void __lockfunc _read_lock(rwlock_t *lock) | 77 | void __lockfunc _read_lock(rwlock_t *lock) |
| 78 | { | 78 | { |