diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /kernel/softlockup.c | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
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) | |||
| 120 | printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", | 120 | printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", |
| 121 | this_cpu, now - touch_timestamp, | 121 | this_cpu, now - touch_timestamp, |
| 122 | current->comm, task_pid_nr(current)); | 122 | current->comm, task_pid_nr(current)); |
| 123 | print_modules(); | ||
| 123 | if (regs) | 124 | if (regs) |
| 124 | show_regs(regs); | 125 | show_regs(regs); |
| 125 | else | 126 | else |