diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/hung_task.c | 2 | ||||
-rw-r--r-- | kernel/lockdep.c | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/kernel/hung_task.c b/kernel/hung_task.c index 0c642d51aac2..bca942379559 100644 --- a/kernel/hung_task.c +++ b/kernel/hung_task.c | |||
@@ -98,7 +98,7 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) | |||
98 | printk(KERN_ERR "\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\"" | 98 | printk(KERN_ERR "\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\"" |
99 | " disables this message.\n"); | 99 | " disables this message.\n"); |
100 | sched_show_task(t); | 100 | sched_show_task(t); |
101 | __debug_show_held_locks(t); | 101 | debug_show_held_locks(t); |
102 | 102 | ||
103 | touch_nmi_watchdog(); | 103 | touch_nmi_watchdog(); |
104 | 104 | ||
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index f2852a510232..84baa71cfda5 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
@@ -3775,7 +3775,7 @@ EXPORT_SYMBOL_GPL(debug_show_all_locks); | |||
3775 | * Careful: only use this function if you are sure that | 3775 | * Careful: only use this function if you are sure that |
3776 | * the task cannot run in parallel! | 3776 | * the task cannot run in parallel! |
3777 | */ | 3777 | */ |
3778 | void __debug_show_held_locks(struct task_struct *task) | 3778 | void debug_show_held_locks(struct task_struct *task) |
3779 | { | 3779 | { |
3780 | if (unlikely(!debug_locks)) { | 3780 | if (unlikely(!debug_locks)) { |
3781 | printk("INFO: lockdep is turned off.\n"); | 3781 | printk("INFO: lockdep is turned off.\n"); |
@@ -3783,12 +3783,6 @@ void __debug_show_held_locks(struct task_struct *task) | |||
3783 | } | 3783 | } |
3784 | lockdep_print_held_locks(task); | 3784 | lockdep_print_held_locks(task); |
3785 | } | 3785 | } |
3786 | EXPORT_SYMBOL_GPL(__debug_show_held_locks); | ||
3787 | |||
3788 | void debug_show_held_locks(struct task_struct *task) | ||
3789 | { | ||
3790 | __debug_show_held_locks(task); | ||
3791 | } | ||
3792 | EXPORT_SYMBOL_GPL(debug_show_held_locks); | 3786 | EXPORT_SYMBOL_GPL(debug_show_held_locks); |
3793 | 3787 | ||
3794 | void lockdep_sys_exit(void) | 3788 | void lockdep_sys_exit(void) |