---

yaml --- r: 87065 b: refs/heads/master c: a790176 h: refs/heads/master i: 87063: 23bbe5d v: v3
git-mirror · Mar 9, 2008 · 41ac977 · 41ac977
1 parent ad10112
commit 41ac977
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38332cb98772f5ea757e6486bed7ed0381cb5f98
+refs/heads/master: a79017660ea4597ec489fab3b5aaf71dd776dfc7
diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
@@ -640,7 +640,7 @@ void tick_cancel_sched_timer(int cpu)
 
 	if (ts->sched_timer.base)
 		hrtimer_cancel(&ts->sched_timer);
-	ts->tick_stopped = 0;
+
 	ts->nohz_mode = NOHZ_MODE_INACTIVE;
 }
 #endif /* HIGH_RES_TIMERS */