---

yaml --- r: 105189 b: refs/heads/master c: 02ff375 h: refs/heads/master i: 105187: 8512db1 v: v3
git-mirror · May 30, 2008 · a67fd5e · a67fd5e
1 parent 3b0d949
commit a67fd5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c4cd6dd1d0fd3057bb6b8c87460049497889d1b
+refs/heads/master: 02ff375590ac4140d88afc76505df1ad45c6af59
diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
@@ -133,15 +133,15 @@ void tick_nohz_update_jiffies(void)
 	if (!ts->tick_stopped)
 		return;
 
-	touch_softlockup_watchdog();
-
 	cpu_clear(cpu, nohz_cpu_mask);
 	now = ktime_get();
 	ts->idle_waketime = now;
 
 	local_irq_save(flags);
 	tick_do_update_jiffies64(now);
 	local_irq_restore(flags);
+
+	touch_softlockup_watchdog();
 }
 
 void tick_nohz_stop_idle(int cpu)