diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-02-10 13:07:21 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 13:55:45 -0800 |
| commit | de5cfcdd23d1001fc9348c17570ffc1f7bc0efee (patch) | |
| tree | 20e0d05395536eb0eef0721a47ed5be228430557 | |
| parent | 970719a34d1e443eee0d52a52b0e8a755819d4cb (diff) | |
| download | lwn-de5cfcdd23d1001fc9348c17570ffc1f7bc0efee.tar.gz lwn-de5cfcdd23d1001fc9348c17570ffc1f7bc0efee.zip | |
3.13.y: timekeeping: Fix clock_set/clock_was_set think-o
In backporting 6fdda9a9c5db367130cf32df5d6618d08b89f46a
(timekeeping: Avoid possible deadlock from clock_was_set_delayed),
I ralized the patch had a think-o where instead of checking
clock_set I accidentally typed clock_was_set (which is a function
- so the conditional always is true).
Upstream this was resolved in the immediately following patch
47a1b796306356f358e515149d86baf0cc6bf007 (tick/timekeeping: Call
update_wall_time outside the jiffies lock). But since that patch
really isn't -stable material, so this patch only pulls
the name change.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 9c4f736210af..89bf18ea8ae4 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1441,7 +1441,7 @@ static void update_wall_time(void) write_seqcount_end(&timekeeper_seq); out: raw_spin_unlock_irqrestore(&timekeeper_lock, flags); - if (clock_was_set) { + if (clock_set) { /* * XXX - I'd rather we just call clock_was_set(), but * since we're currently holding the jiffies lock, calling |