diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2008-08-11 22:45:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 22:45:51 +0200 |
| commit | 0f2bc27be27ca1dcc66b96131e44bf7648b959c6 (patch) | |
| tree | 22ea7b9a28878851f445a5420ff80b64ee1cfdd1 /kernel | |
| parent | e5f363e358cf16e4ad13a6826e15088c5495efe9 (diff) | |
| download | op-kernel-dev-0f2bc27be27ca1dcc66b96131e44bf7648b959c6.zip op-kernel-dev-0f2bc27be27ca1dcc66b96131e44bf7648b959c6.tar.gz | |
lockdep: fix debug_lock_alloc
When we enable DEBUG_LOCK_ALLOC but do not enable PROVE_LOCKING and or
LOCK_STAT, lock_alloc() and lock_release() turn into nops, even though
we should be doing hlock checking (check=1).
This causes a false warning and a lockdep self-disable.
Rectify this.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/lockdep.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index ab933fe..1aa91fd 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -2935,9 +2935,6 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, { unsigned long flags; - if (unlikely(!lock_stat && !prove_locking)) - return; - if (unlikely(current->lockdep_recursion)) return; @@ -2958,9 +2955,6 @@ void lock_release(struct lockdep_map *lock, int nested, { unsigned long flags; - if (unlikely(!lock_stat && !prove_locking)) - return; - if (unlikely(current->lockdep_recursion)) return; |
