3.13.y: timekeeping: Fix clock_set/clock_was_set think-o
authorJohn Stultz <john.stultz@linaro.org>
Mon, 10 Feb 2014 21:07:21 +0000 (13:07 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Feb 2014 21:55:45 +0000 (13:55 -0800)
commitde5cfcdd23d1001fc9348c17570ffc1f7bc0efee
tree20e0d05395536eb0eef0721a47ed5be228430557
parent970719a34d1e443eee0d52a52b0e8a755819d4cb
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>
kernel/time/timekeeping.c