aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softlockup.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/softlockup.c')
-rw-r--r--kernel/softlockup.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 72c2561ff5f8..edeeef3a6a32 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -24,6 +24,7 @@ static DEFINE_PER_CPU(unsigned long, print_timestamp);
24static DEFINE_PER_CPU(struct task_struct *, watchdog_task); 24static DEFINE_PER_CPU(struct task_struct *, watchdog_task);
25 25
26static int did_panic; 26static int did_panic;
27int softlockup_thresh = 10;
27 28
28static int 29static int
29softlock_panic(struct notifier_block *this, unsigned long event, void *ptr) 30softlock_panic(struct notifier_block *this, unsigned long event, void *ptr)
@@ -104,13 +105,15 @@ void softlockup_tick(void)
104 wake_up_process(per_cpu(watchdog_task, this_cpu)); 105 wake_up_process(per_cpu(watchdog_task, this_cpu));
105 106
106 /* Warn about unreasonable 10+ seconds delays: */ 107 /* Warn about unreasonable 10+ seconds delays: */
107 if (now <= (touch_timestamp + 10)) 108 if (now <= (touch_timestamp + softlockup_thresh))
108 return; 109 return;
109 110
110 per_cpu(print_timestamp, this_cpu) = touch_timestamp; 111 per_cpu(print_timestamp, this_cpu) = touch_timestamp;
111 112
112 spin_lock(&print_lock); 113 spin_lock(&print_lock);
113 printk(KERN_ERR "BUG: soft lockup detected on CPU#%d!\n", this_cpu); 114 printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n",
115 this_cpu, now - touch_timestamp,
116 current->comm, current->pid);
114 if (regs) 117 if (regs)
115 show_regs(regs); 118 show_regs(regs);
116 else 119 else