Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27

1 files changed, 10 insertions, 5 deletions

diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 01b6522fd92b..c828c2339cc9 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -49,12 +49,17 @@ static unsigned long get_timestamp(int this_cpu)
         return cpu_clock(this_cpu) >> 30LL;  /* 2^30 ~= 10^9 */
 }
 
-void touch_softlockup_watchdog(void)
+static void __touch_softlockup_watchdog(void)
 {
         int this_cpu = raw_smp_processor_id();
 
         __raw_get_cpu_var(touch_timestamp) = get_timestamp(this_cpu);
 }
+
+void touch_softlockup_watchdog(void)
+{
+        __raw_get_cpu_var(touch_timestamp) = 0;
+}
 EXPORT_SYMBOL(touch_softlockup_watchdog);
 
 void touch_all_softlockup_watchdogs(void)
@@ -80,7 +85,7 @@ void softlockup_tick(void)
         unsigned long now;
 
         if (touch_timestamp == 0) {
-                touch_softlockup_watchdog();
+                __touch_softlockup_watchdog();
                 return;
         }
 
@@ -95,7 +100,7 @@ void softlockup_tick(void)
 
         /* do not print during early bootup: */
         if (unlikely(system_state != SYSTEM_RUNNING)) {
-                touch_softlockup_watchdog();
+                __touch_softlockup_watchdog();
                 return;
         }
 
@@ -214,7 +219,7 @@ static int watchdog(void *__bind_cpu)
         sched_setscheduler(current, SCHED_FIFO, &param);
 
         /* initialize timestamp */
-        touch_softlockup_watchdog();
+        __touch_softlockup_watchdog();
 
         set_current_state(TASK_INTERRUPTIBLE);
         /*
@@ -223,7 +228,7 @@ static int watchdog(void *__bind_cpu)
          * debug-printout triggers in softlockup_tick().
          */
         while (!kthread_should_stop()) {
-                touch_softlockup_watchdog();
+                __touch_softlockup_watchdog();
                 schedule();
 
                 if (kthread_should_stop())