Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1b499f0 authored by John Kacur's avatar John Kacur Committed by Ingo Molnar
Browse files

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: default avatarJohn 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: default avatarIngo Molnar <mingo@elte.hu>
parent da5cabf8

include/linux/debug_locks.h

+0 −5
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ struct task_struct; 


#ifdef CONFIG_LOCKDEP

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_check_no_locks_freed(const void *from, unsigned long len);

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)

{

}

kernel/hung_task.c

+1 −1
Original line number Diff line number Diff line
@@ -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\""

			" disables this message.\n");

	sched_show_task(t);

	__debug_show_held_locks(t);

	debug_show_held_locks(t);



	touch_nmi_watchdog();

kernel/lockdep.c

+1 −7
Original line number Diff line number Diff line
@@ -3775,7 +3775,7 @@ EXPORT_SYMBOL_GPL(debug_show_all_locks); 
 * Careful: only use this function if you are sure that

 * 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)) {

		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);

}

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);



void lockdep_sys_exit(void)