From 41ac9771f37d452ac286857536f383b7d8f2986b Mon Sep 17 00:00:00 2001 From: Karsten Wiese Date: Tue, 4 Mar 2008 14:59:55 -0800 Subject: [PATCH] --- yaml --- r: 87065 b: refs/heads/master c: a79017660ea4597ec489fab3b5aaf71dd776dfc7 h: refs/heads/master i: 87063: 23bbe5d7945d57b75c8d3571d158ba3f7c9f11df v: v3 --- [refs] | 2 +- trunk/kernel/time/tick-sched.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 44369f2f7df6..f2aac49eded3 100644 --- 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 index 2968298f8f36..686da821d376 100644 --- 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 */