diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-25 08:27:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 08:27:26 +0100 |
| commit | a2b4c607c93a0850c8e3d90688cf3bd08576b986 (patch) | |
| tree | fd1ef8cd906a864f6db3551b3891fd5d0c2075fd /kernel/sched/core.c | |
| parent | 15c81026204da897a05424c79263aea861a782cc (diff) | |
| parent | 8fe8ff09ce3b5750e1f3e45a1f4a81d59c7ff1f1 (diff) | |
| download | op-kernel-dev-a2b4c607c93a0850c8e3d90688cf3bd08576b986.zip op-kernel-dev-a2b4c607c93a0850c8e3d90688cf3bd08576b986.tar.gz | |
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/urgent
Pull dynticks cleanups from Frederic Weisbecker.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -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 36c951b..75badda 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2453,7 +2453,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 |
