From 6b7e8b10122884f7152f3490102400a378cc1036 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 25 Mar 2006 03:06:32 -0800
Subject: [PATCH] --- yaml --- r: 23499 b: refs/heads/master c:
 185ae6d7a32721e9062030a9f2d24ed714fa45df h: refs/heads/master i:   23497:
 713e0afe4c975847476084d985313d787888f3ce   23495:
 d9cabeda1724e5d3bafb81227462da25a55e211c v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/softlockup.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c6b05d1712fc..9879ce70db2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc83455bc8336f57cd74d6e86b0f8fcad187d179
+refs/heads/master: 185ae6d7a32721e9062030a9f2d24ed714fa45df
diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c
index dd9524fa649a..d9b3d5847ed8 100644
--- a/trunk/kernel/softlockup.c
+++ b/trunk/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;