From: Andrew Morton <akpm@osdl.org>
Date: Sat, 25 Mar 2006 11:06:32 +0000 (-0800)
Subject: [PATCH] timer irq driven soft watchdog fix
X-Git-Tag: v2.6.17-rc1~862
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=185ae6d7a32721e9062030a9f2d24ed714fa45df;p=~shefty%2Frdma-dev.git

[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>
---

diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index dd9524fa649..d9b3d5847ed 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -118,6 +118,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 			printk("watchdog for %i failed\n", hotcpu);
 			return NOTIFY_BAD;
 		}
+  		per_cpu(touch_timestamp, hotcpu) = jiffies;
   		per_cpu(watchdog_task, hotcpu) = p;
 		kthread_bind(p, hotcpu);
  		break;