diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
| commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
| tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /kernel/lockdep.c | |
| parent | 06d63cc51d47f572009138a7f3ac34d95773405d (diff) | |
| parent | de46c33745f5e2ad594c72f2cf5f490861b16ce1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/lockdep.c')
| -rw-r--r-- | kernel/lockdep.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 8dc24c92dc6d..7065a687ac54 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
| @@ -2742,6 +2742,10 @@ void debug_show_all_locks(void) | |||
| 2742 | int count = 10; | 2742 | int count = 10; |
| 2743 | int unlock = 1; | 2743 | int unlock = 1; |
| 2744 | 2744 | ||
| 2745 | if (unlikely(!debug_locks)) { | ||
| 2746 | printk("INFO: lockdep is turned off.\n"); | ||
| 2747 | return; | ||
| 2748 | } | ||
| 2745 | printk("\nShowing all locks held in the system:\n"); | 2749 | printk("\nShowing all locks held in the system:\n"); |
| 2746 | 2750 | ||
| 2747 | /* | 2751 | /* |
| @@ -2785,6 +2789,10 @@ EXPORT_SYMBOL_GPL(debug_show_all_locks); | |||
| 2785 | 2789 | ||
| 2786 | void debug_show_held_locks(struct task_struct *task) | 2790 | void debug_show_held_locks(struct task_struct *task) |
| 2787 | { | 2791 | { |
| 2792 | if (unlikely(!debug_locks)) { | ||
| 2793 | printk("INFO: lockdep is turned off.\n"); | ||
| 2794 | return; | ||
| 2795 | } | ||
| 2788 | lockdep_print_held_locks(task); | 2796 | lockdep_print_held_locks(task); |
| 2789 | } | 2797 | } |
| 2790 | 2798 | ||