diff options
author | Ingo Molnar | 2008-07-11 10:46:50 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-11 10:46:50 +0200 |
commit | 0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b (patch) | |
tree | 6f82579cae6d6e39fa9f837a3c349ded51e19d14 /kernel/softlockup.c | |
parent | rcu: make rcutorture even more vicious: invoke RCU readers from irq handlers ... (diff) | |
parent | Fix PREEMPT_RCU without HOTPLUG_CPU (diff) | |
download | kernel-qcow2-linux-0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b.tar.gz kernel-qcow2-linux-0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b.tar.xz kernel-qcow2-linux-0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b.zip |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/softlockup.c')
-rw-r--r-- | kernel/softlockup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index c828c2339cc9..a272d78185eb 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c @@ -120,6 +120,7 @@ void softlockup_tick(void) printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", this_cpu, now - touch_timestamp, current->comm, task_pid_nr(current)); + print_modules(); if (regs) show_regs(regs); else |