diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2014-04-15 10:54:40 +0530 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-04-15 20:26:45 +0200 |
| commit | 03e6bdc5c4d0fc166bfd5d3cf749a5a0c1b5b1bd (patch) | |
| tree | 0c66bdc3be7d9b8087352ed9d3dbc7fbaf2382a3 /kernel/time/tick-sched.c | |
| parent | 521c42990e9d561ed5ed9f501f07639d0512b3c9 (diff) | |
| download | talos-op-linux-03e6bdc5c4d0fc166bfd5d3cf749a5a0c1b5b1bd.tar.gz talos-op-linux-03e6bdc5c4d0fc166bfd5d3cf749a5a0c1b5b1bd.zip | |
tick-sched: Don't call update_wall_time() when delta is lesser than tick_period
In tick_do_update_jiffies64() we are processing ticks only if delta is
greater than tick_period. This is what we are supposed to do here and
it broke a bit with this patch:
commit 47a1b796 (tick/timekeeping: Call update_wall_time outside the
jiffies lock)
With above patch, we might end up calling update_wall_time() even if
delta is found to be smaller that tick_period. Fix this by returning
when the delta is less than tick period.
[ tglx: Made it a 3 liner and massaged changelog ]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: linaro-kernel@lists.linaro.org
Cc: fweisbec@gmail.com
Cc: Arvind.Chauhan@arm.com
Cc: linaro-networking@linaro.org
Cc: John Stultz <john.stultz@linaro.org>
Cc: <stable@vger.kernel.org> # v3.14+
Link: http://lkml.kernel.org/r/80afb18a494b0bd9710975bcc4de134ae323c74f.1397537987.git.viresh.kumar@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 9f8af69c67ec..e947d968c5b5 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -84,6 +84,9 @@ static void tick_do_update_jiffies64(ktime_t now) /* Keep the tick_next_period variable up to date */ tick_next_period = ktime_add(last_jiffies_update, tick_period); + } else { + write_sequnlock(&jiffies_lock); + return; } write_sequnlock(&jiffies_lock); update_wall_time(); |
