diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-09 13:06:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-09 13:06:49 -0400 |
| commit | bf5a25e1fff88a1066e20cc7263329405e4939f6 (patch) | |
| tree | 95822dc50801e21cf1ad1e6aa7b58af898156517 /kernel/time/tick-sched.c | |
| parent | 83f7a2c118833d3738b4d162ea3c17d0bd8ffa94 (diff) | |
| parent | 10a398d04c4a1fc395840f4d040493375f562302 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
time: remove obsolete CLOCK_TICK_ADJUST
time: don't touch an offlined CPU's ts->tick_stopped in tick_cancel_sched_timer()
time: prevent the loop in timespec_add_ns() from being optimised away
ntp: use unsigned input for do_div()
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 2968298f8f36..686da821d376 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -640,7 +640,7 @@ void tick_cancel_sched_timer(int cpu) | |||
| 640 | 640 | ||
| 641 | if (ts->sched_timer.base) | 641 | if (ts->sched_timer.base) |
| 642 | hrtimer_cancel(&ts->sched_timer); | 642 | hrtimer_cancel(&ts->sched_timer); |
| 643 | ts->tick_stopped = 0; | 643 | |
| 644 | ts->nohz_mode = NOHZ_MODE_INACTIVE; | 644 | ts->nohz_mode = NOHZ_MODE_INACTIVE; |
| 645 | } | 645 | } |
| 646 | #endif /* HIGH_RES_TIMERS */ | 646 | #endif /* HIGH_RES_TIMERS */ |