diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-12-12 13:10:55 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-12-23 11:54:32 -0800 |
| commit | 47a1b796306356f358e515149d86baf0cc6bf007 (patch) | |
| tree | 0ab5132f643db4318b395f2cb13f435ba3d9e5b6 /kernel/time/tick-sched.c | |
| parent | 6fdda9a9c5db367130cf32df5d6618d08b89f46a (diff) | |
| download | linux-47a1b796306356f358e515149d86baf0cc6bf007.tar.gz linux-47a1b796306356f358e515149d86baf0cc6bf007.tar.bz2 linux-47a1b796306356f358e515149d86baf0cc6bf007.zip | |
tick/timekeeping: Call update_wall_time outside the jiffies lock
Since the xtime lock was split into the timekeeping lock and
the jiffies lock, we no longer need to call update_wall_time()
while holding the jiffies lock.
Thus, this patch splits update_wall_time() out from do_timer().
This allows us to get away from calling clock_was_set_delayed()
in update_wall_time() and instead use the standard clock_was_set()
call that previously would deadlock, as it causes the jiffies lock
to be acquired.
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 2afd43fca93b..c58b03d89951 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -86,6 +86,7 @@ static void tick_do_update_jiffies64(ktime_t now) tick_next_period = ktime_add(last_jiffies_update, tick_period); } write_sequnlock(&jiffies_lock); + update_wall_time(); } /* |