diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 09:02:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 09:02:51 -0800 |
| commit | aafd9d6a46745926648cb5d0b68b108e79ceb8d4 (patch) | |
| tree | b099dece2ff08e57d141af686ffbb24dc663c05b /kernel/sched | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/urgent (diff) | |
| download | linux-dev-aafd9d6a46745926648cb5d0b68b108e79ceb8d4.tar.xz linux-dev-aafd9d6a46745926648cb5d0b68b108e79ceb8d4.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer/dynticks updates from Ingo Molnar:
"This tree contains misc dynticks updates: a fix and three cleanups"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/nohz: Fix overflow error in scheduler_tick_max_deferment()
nohz_full: fix code style issue of tick_nohz_full_stop_tick
nohz: Get timekeeping max deferment outside jiffies_lock
tick: Rename tick_check_idle() to tick_irq_enter()
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 656cd70eb577..b46131ef6aab 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2476,7 +2476,7 @@ u64 scheduler_tick_max_deferment(void) if (time_before_eq(next, now)) return 0; - return jiffies_to_usecs(next - now) * NSEC_PER_USEC; + return jiffies_to_nsecs(next - now); } #endif |