From: Ingo Molnar Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton --- kernel/softlockup.c | 2 +- linux/sched.h | 0 timer.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/sched.h~timer-irq-driven-soft-watchdog-cleanups-update include/linux/sched.h diff -puN kernel/softlockup.c~timer-irq-driven-soft-watchdog-cleanups-update kernel/softlockup.c --- devel/kernel/softlockup.c~timer-irq-driven-soft-watchdog-cleanups-update 2006-02-23 22:51:43.000000000 -0800 +++ devel-akpm/kernel/softlockup.c 2006-02-23 22:51:43.000000000 -0800 @@ -118,7 +118,7 @@ cpu_callback(struct notifier_block *nfb, printk("watchdog for %i failed\n", hotcpu); return NOTIFY_BAD; } - per_cpu(timestamp, hotcpu) = jiffies; + per_cpu(touch_timestamp, hotcpu) = jiffies; per_cpu(watchdog_task, hotcpu) = p; kthread_bind(p, hotcpu); break; diff -puN kernel/timer.c~timer-irq-driven-soft-watchdog-cleanups-update kernel/timer.c _