Skip to contentSkip to conversation

lockdep: Remove __debug_show_held_locks

PATCH In review John Kacur 1 participant 4 messages Aug 5, 2010 – Aug 17, 2010 Hung task detector

lore
Share & tools
lore

John Kacur

author
#0 lore raw

PATCH 1/2 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.

---
 include/linux/debug_locks.h |    5 -----
 kernel/hung_task.c          |    2 +-
 kernel/lockdep.c            |    8 +-------
 3 files changed, 2 insertions(+), 13 deletions(-)
include/linux/debug_locks.h +0 -5
index 29b3ce3..2833452 100644
@@ -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
index 0c642d5..bca9423 100644
@@ -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
index 5428679..843030b 100644
@@ -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)
Signature · 1 line
1.7.2
author
#1 lore raw

PATCH 2/2 fix grammar by adding a missing "to" in the comments

This fixes a minor grammar problem in the comments in hung_task.c

---
 kernel/hung_task.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/hung_task.c +1 -1
index bca9423..53ead17 100644
@@ -111,7 +111,7 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
  * periodically exit the critical section and enter a new one.
  *
  * For preemptible RCU it is sufficient to call rcu_read_unlock in order
- * exit the grace period. For classic RCU, a reschedule is required.
+ * to exit the grace period. For classic RCU, a reschedule is required.
  */
 static void rcu_lock_break(struct task_struct *g, struct task_struct *t)
 {
Signature · 1 line
1.7.2
#2 lore raw

[tip:core/urgent] lockup detector: Fix grammar by adding a missing "to" in the comments

Commit-ID:  6a103b0d44e9f97dc430002cf3ac7a7defa3819f
Gitweb:     http://git.kernel.org/tip/6a103b0d44e9f97dc430002cf3ac7a7defa3819f
Author:     John Kacur <[email protected]>
AuthorDate: Thu, 5 Aug 2010 17:10:54 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 17 Aug 2010 09:11:52 +0200

lockup detector: Fix grammar by adding a missing "to" in the comments

This fixes a minor grammar problem in the comments in hung_task.c

Cc Peter Zijlstra <[email protected]>

LKML-Reference: <[email protected]>

---
 kernel/hung_task.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/hung_task.c +1 -1
index bca9423..53ead17 100644
@@ -111,7 +111,7 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
  * periodically exit the critical section and enter a new one.
  *
  * For preemptible RCU it is sufficient to call rcu_read_unlock in order
- * exit the grace period. For classic RCU, a reschedule is required.
+ * to exit the grace period. For classic RCU, a reschedule is required.
  */
 static void rcu_lock_break(struct task_struct *g, struct task_struct *t)
 {
#3 lore raw
In reply to John Kacur
Commit-ID:  f1b499f029c5dde85d46a8811353c62f29157541
Gitweb:     http://git.kernel.org/tip/f1b499f029c5dde85d46a8811353c62f29157541
Author:     John Kacur <[email protected]>
AuthorDate: Thu, 5 Aug 2010 17:10:53 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 17 Aug 2010 09:11:10 +0200

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.

Cc Peter Zijlstra <[email protected]>

LKML-Reference: <[email protected]>

---
 include/linux/debug_locks.h |    5 -----
 kernel/hung_task.c          |    2 +-
 kernel/lockdep.c            |    8 +-------
 3 files changed, 2 insertions(+), 13 deletions(-)
include/linux/debug_locks.h +0 -5
index 29b3ce3..2833452 100644
@@ -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
index 0c642d5..bca9423 100644
@@ -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
index f2852a5..84baa71 100644
@@ -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)