diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-06-07 13:17:30 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-14 16:35:16 +0400 |
| commit | 94d24fc47219219b5aa23b45956cc37ee5aa5b01 (patch) | |
| tree | cc7f5fbf4f2e9c6243c9b3ce2439c2d3807d5f12 /include/linux/lockdep.h | |
| parent | 7f80850d3f9fd8fda23a317044aef3a6bafab06b (diff) | |
| download | linux-94d24fc47219219b5aa23b45956cc37ee5aa5b01.tar.xz | |
printk, lockdep: Disable lock debugging on zap_locks()
zap_locks() is used by printk() in a last ditch effort to get data
out, clearly we cannot trust lock state after this so make it disable
lock debugging.
Also don't treat printk recursion through lockdep as a normal
recursion bug but try hard to get the lockdep splat out.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-kqxwmo4xz37e1s8w0xopvr0q@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/lockdep.h')
| -rw-r--r-- | include/linux/lockdep.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index b6a56e37284c..d36619ead3ba 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -343,6 +343,8 @@ extern void lockdep_trace_alloc(gfp_t mask); #define lockdep_assert_held(l) WARN_ON(debug_locks && !lockdep_is_held(l)) +#define lockdep_recursing(tsk) ((tsk)->lockdep_recursion) + #else /* !LOCKDEP */ static inline void lockdep_off(void) @@ -392,6 +394,8 @@ struct lock_class_key { }; #define lockdep_assert_held(l) do { } while (0) +#define lockdep_recursing(tsk) (0) + #endif /* !LOCKDEP */ #ifdef CONFIG_LOCK_STAT |