diff options
author | John Stultz <john.stultz@linaro.org> | 2013-12-12 22:10:55 +0100 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-12-23 20:54:32 +0100 |
commit | 47a1b796306356f358e515149d86baf0cc6bf007 (patch) | |
tree | 0ab5132f643db4318b395f2cb13f435ba3d9e5b6 /kernel/time/tick-internal.h | |
parent | timekeeping: Avoid possible deadlock from clock_was_set_delayed (diff) | |
download | linux-47a1b796306356f358e515149d86baf0cc6bf007.tar.xz 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-internal.h')
-rw-r--r-- | kernel/time/tick-internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index e2bced59b6dd..8329669b51ec 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -155,3 +155,4 @@ static inline int tick_device_is_functional(struct clock_event_device *dev) #endif extern void do_timer(unsigned long ticks); +extern void update_wall_time(void); |