This is a note to let you know that I've just added the patch titled
3.13.y: timekeeping: Fix clock_set/clock_was_set think-o
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
3.13.y-timekeeping-fix-clock_set-clock_was_set-think-o.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From john.stultz@xxxxxxxxxx Tue Feb 11 09:56:02 2014
From: John Stultz <john.stultz@xxxxxxxxxx>
Date: Mon, 10 Feb 2014 13:07:21 -0800
Subject: 3.13.y: timekeeping: Fix clock_set/clock_was_set think-o
To: stable <stable@xxxxxxxxxxxxxxx>
Cc: John Stultz <john.stultz@xxxxxxxxxx>, Thomas Gleixner <tglx@xxxxxxxxxxxxx>, Prarit Bhargava <prarit@xxxxxxxxxx>, Richard Cochran <richardcochran@xxxxxxxxx>, Ingo Molnar <mingo@xxxxxxxxxx>, Sasha Levin <sasha.levin@xxxxxxxxxx>
Message-ID: <1392066444-4940-5-git-send-email-john.stultz@xxxxxxxxxx>
From: John Stultz <john.stultz@xxxxxxxxxx>
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@xxxxxxxxxxxxx>
Cc: Prarit Bhargava <prarit@xxxxxxxxxx>
Cc: Richard Cochran <richardcochran@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Sasha Levin <sasha.levin@xxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/time/timekeeping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 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
Patches currently in stable-queue which might be from john.stultz@xxxxxxxxxx are
queue-3.12/3.13.y-timekeeping-fix-clock_set-clock_was_set-think-o.patch
queue-3.12/timekeeping-fix-potential-lost-pv-notification-of-time-change.patch
queue-3.12/timekeeping-fix-lost-updates-to-tai-adjustment.patch
queue-3.12/timekeeping-avoid-possible-deadlock-from-clock_was_set_delayed.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html