projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'regulator/topic/twl' into v3.9-rc8
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
lockdep.c
diff --git
a/kernel/lockdep.c
b/kernel/lockdep.c
index 259db207b5d90806536da88963e7d1b469e1b943..8a0efac4f99de7c5d0711bea6792db1f385f66eb 100644
(file)
--- a/
kernel/lockdep.c
+++ b/
kernel/lockdep.c
@@
-4088,7
+4088,7
@@
void debug_check_no_locks_freed(const void *mem_from, unsigned long mem_len)
}
EXPORT_SYMBOL_GPL(debug_check_no_locks_freed);
}
EXPORT_SYMBOL_GPL(debug_check_no_locks_freed);
-static void print_held_locks_bug(
void
)
+static void print_held_locks_bug(
struct task_struct *curr
)
{
if (!debug_locks_off())
return;
{
if (!debug_locks_off())
return;
@@
-4097,21
+4097,22
@@
static void print_held_locks_bug(void)
printk("\n");
printk("=====================================\n");
printk("\n");
printk("=====================================\n");
- printk("[ BUG: %s/%d still has locks held! ]\n",
- current->comm, task_pid_nr(current));
+ printk("[ BUG: lock held at task exit time! ]\n");
print_kernel_ident();
printk("-------------------------------------\n");
print_kernel_ident();
printk("-------------------------------------\n");
- lockdep_print_held_locks(current);
+ printk("%s/%d is exiting with locks still held!\n",
+ curr->comm, task_pid_nr(curr));
+ lockdep_print_held_locks(curr);
+
printk("\nstack backtrace:\n");
dump_stack();
}
printk("\nstack backtrace:\n");
dump_stack();
}
-void debug_check_no_locks_held(
void
)
+void debug_check_no_locks_held(
struct task_struct *task
)
{
{
- if (unlikely(
current
->lockdep_depth > 0))
- print_held_locks_bug();
+ if (unlikely(
task
->lockdep_depth > 0))
+ print_held_locks_bug(
task
);
}
}
-EXPORT_SYMBOL_GPL(debug_check_no_locks_held);
void debug_show_all_locks(void)
{
void debug_show_all_locks(void)
{