Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

lockdep: Remove __debug_show_held_locks

There is no longer any functional difference between
__debug_show_held_locks() and debug_show_held_locks(),
so remove the former.

Signed-off-by: John Kacur <jkacur@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1281021054-4228-1-git-send-email-jkacur@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by

John Kacur and committed by
Ingo Molnar
f1b499f0 da5cabf8

+2 -13
-5
include/linux/debug_locks.h
··· 49 49 50 50 #ifdef CONFIG_LOCKDEP 51 51 extern void debug_show_all_locks(void); 52 - extern void __debug_show_held_locks(struct task_struct *task); 53 52 extern void debug_show_held_locks(struct task_struct *task); 54 53 extern void debug_check_no_locks_freed(const void *from, unsigned long len); 55 54 extern void debug_check_no_locks_held(struct task_struct *task); 56 55 #else 57 56 static inline void debug_show_all_locks(void) 58 - { 59 - } 60 - 61 - static inline void __debug_show_held_locks(struct task_struct *task) 62 57 { 63 58 } 64 59
+1 -1
kernel/hung_task.c
··· 98 98 printk(KERN_ERR "\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\"" 99 99 " disables this message.\n"); 100 100 sched_show_task(t); 101 - __debug_show_held_locks(t); 101 + debug_show_held_locks(t); 102 102 103 103 touch_nmi_watchdog(); 104 104
+1 -7
kernel/lockdep.c
··· 3775 3775 * Careful: only use this function if you are sure that 3776 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 3780 if (unlikely(!debug_locks)) { 3781 3781 printk("INFO: lockdep is turned off.\n"); 3782 3782 return; 3783 3783 } 3784 3784 lockdep_print_held_locks(task); 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 3785 } 3792 3786 EXPORT_SYMBOL_GPL(debug_show_held_locks); 3793 3787