Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

lockdep: Remove __debug_show_held_locks

Browse Source 
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>
This commit is contained in:
John Kacur 2010-08-05 17:10:53 +02:00 committed by Ingo Molnar
parent da5cabf80e
commit f1b499f029
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/debug_locks.h
View File

@ -49,7 +49,6 @@ struct task_struct;
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
extern void debug_show_all_locks(void); extern void debug_show_all_locks(void);
extern void __debug_show_held_locks(struct task_struct *task);
extern void debug_show_held_locks(struct task_struct *task); extern void debug_show_held_locks(struct task_struct *task);
extern void debug_check_no_locks_freed(const void *from, unsigned long len); extern void debug_check_no_locks_freed(const void *from, unsigned long len);
extern void debug_check_no_locks_held(struct task_struct *task); extern void debug_check_no_locks_held(struct task_struct *task);
@ -58,10 +57,6 @@ static inline void debug_show_all_locks(void)
{ {
} }
static inline void __debug_show_held_locks(struct task_struct *task)
{
}
static inline void debug_show_held_locks(struct task_struct *task) static inline void debug_show_held_locks(struct task_struct *task)
{ {
} }

2
kernel/hung_task.c
View File

@ -98,7 +98,7 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
printk(KERN_ERR "\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\"" printk(KERN_ERR "\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\""
" disables this message.\n"); " disables this message.\n");
sched_show_task(t); sched_show_task(t);
__debug_show_held_locks(t); debug_show_held_locks(t);
touch_nmi_watchdog(); touch_nmi_watchdog();

8
kernel/lockdep.c
View File

@ -3775,7 +3775,7 @@ EXPORT_SYMBOL_GPL(debug_show_all_locks);
* Careful: only use this function if you are sure that * Careful: only use this function if you are sure that
* the task cannot run in parallel! * the task cannot run in parallel!
*/ */
void __debug_show_held_locks(struct task_struct *task) void debug_show_held_locks(struct task_struct *task)
{ {
if (unlikely(!debug_locks)) { if (unlikely(!debug_locks)) {
printk("INFO: lockdep is turned off.\n"); printk("INFO: lockdep is turned off.\n");
@ -3783,12 +3783,6 @@ void __debug_show_held_locks(struct task_struct *task)
} }
lockdep_print_held_locks(task); lockdep_print_held_locks(task);
} }
EXPORT_SYMBOL_GPL(__debug_show_held_locks);
void debug_show_held_locks(struct task_struct *task)
{
__debug_show_held_locks(task);
}
EXPORT_SYMBOL_GPL(debug_show_held_locks); EXPORT_SYMBOL_GPL(debug_show_held_locks);
void lockdep_sys_exit(void) void lockdep_sys_exit(void)