aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softlockup.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-25 06:06:32 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 11:22:48 -0500
commit185ae6d7a32721e9062030a9f2d24ed714fa45df (patch)
tree0b58171078097f6a4e80c56e138d654a2d68a188 /kernel/softlockup.c
parentbc83455bc8336f57cd74d6e86b0f8fcad187d179 (diff)
[PATCH] timer irq driven soft watchdog fix
I seem to have lost this hunk in yesterday's patch. It brings the coming-online CPU's softlockup timer up to date so we don't get false-positive tripups during CPU hot-add. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/softlockup.c')
-rw-r--r--kernel/softlockup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index dd9524fa649a..d9b3d5847ed8 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -118,6 +118,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
118 printk("watchdog for %i failed\n", hotcpu); 118 printk("watchdog for %i failed\n", hotcpu);
119 return NOTIFY_BAD; 119 return NOTIFY_BAD;
120 } 120 }
121 per_cpu(touch_timestamp, hotcpu) = jiffies;
121 per_cpu(watchdog_task, hotcpu) = p; 122 per_cpu(watchdog_task, hotcpu) = p;
122 kthread_bind(p, hotcpu); 123 kthread_bind(p, hotcpu);
123 break; 124 break;