diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-08 13:14:34 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-08 13:14:34 -0400 |
commit | d25feb4ea00165d6b76de0fff58821e65242ec74 (patch) | |
tree | 35b53e1b90064c2db7484aac0b8a742d9c8e920d | |
parent | b5be0755a8663534bd74db27829be52894e72267 (diff) | |
download | longterm-queue-2.6.34-d25feb4ea00165d6b76de0fff58821e65242ec74.tar.gz |
standardize leapsecond upstream ref strings
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
11 files changed, 11 insertions, 11 deletions
diff --git a/queue/hrtimer-Provide-clock_was_set_delayed.patch b/queue/hrtimer-Provide-clock_was_set_delayed.patch index 5c87b2c..71f2f73 100644 --- a/queue/hrtimer-Provide-clock_was_set_delayed.patch +++ b/queue/hrtimer-Provide-clock_was_set_delayed.patch @@ -3,7 +3,7 @@ From: John Stultz <johnstul@us.ibm.com> Date: Tue, 17 Jul 2012 17:49:25 -0400 Subject: [PATCH] hrtimer: Provide clock_was_set_delayed() -This is a backport of f55a6faa384304c89cfef162768e88374d3312cb +commit f55a6faa384304c89cfef162768e88374d3312cb upstream. clock_was_set() cannot be called from hard interrupt context because it calls on_each_cpu(). diff --git a/queue/hrtimer-Update-hrtimer-base-offsets-each-hrtimer_int.patch b/queue/hrtimer-Update-hrtimer-base-offsets-each-hrtimer_int.patch index 3e72976..df01691 100644 --- a/queue/hrtimer-Update-hrtimer-base-offsets-each-hrtimer_int.patch +++ b/queue/hrtimer-Update-hrtimer-base-offsets-each-hrtimer_int.patch @@ -3,7 +3,7 @@ From: John Stultz <johnstul@us.ibm.com> Date: Tue, 17 Jul 2012 17:49:30 -0400 Subject: [PATCH] hrtimer: Update hrtimer base offsets each hrtimer_interrupt -This is a backport of 5baefd6d84163443215f4a99f6a20f054ef11236 +commit 5baefd6d84163443215f4a99f6a20f054ef11236 upstream. The update of the hrtimer base offsets on all cpus cannot be made atomically from the timekeeper.lock held and interrupt disabled region diff --git a/queue/hrtimers-Move-lock-held-region-in-hrtimer_interrupt.patch b/queue/hrtimers-Move-lock-held-region-in-hrtimer_interrupt.patch index 7c4f16c..b96dc36 100644 --- a/queue/hrtimers-Move-lock-held-region-in-hrtimer_interrupt.patch +++ b/queue/hrtimers-Move-lock-held-region-in-hrtimer_interrupt.patch @@ -3,7 +3,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 17 Jul 2012 17:49:28 -0400 Subject: [PATCH] hrtimers: Move lock held region in hrtimer_interrupt() -This is a backport of 196951e91262fccda81147d2bcf7fdab08668b40 +commit 196951e91262fccda81147d2bcf7fdab08668b40 upstream. We need to update the base offsets from this code and we need to do that under base->lock. Move the lock held region around the diff --git a/queue/ntp-Correct-TAI-offset-during-leap-second.patch b/queue/ntp-Correct-TAI-offset-during-leap-second.patch index 421ef90..620b7e0 100644 --- a/queue/ntp-Correct-TAI-offset-during-leap-second.patch +++ b/queue/ntp-Correct-TAI-offset-during-leap-second.patch @@ -3,7 +3,7 @@ From: Richard Cochran <richardcochran@gmail.com> Date: Tue, 17 Jul 2012 17:49:22 -0400 Subject: [PATCH] ntp: Correct TAI offset during leap second -This is a backport of dd48d708ff3e917f6d6b6c2b696c3f18c019feed +commit dd48d708ff3e917f6d6b6c2b696c3f18c019feed upstream. When repeating a UTC time value during a leap second (when the UTC time should be 23:59:60), the TAI timescale should not stop. The kernel diff --git a/queue/ntp-Fix-leap-second-hrtimer-livelock.patch b/queue/ntp-Fix-leap-second-hrtimer-livelock.patch index c5cad66..9206f4f 100644 --- a/queue/ntp-Fix-leap-second-hrtimer-livelock.patch +++ b/queue/ntp-Fix-leap-second-hrtimer-livelock.patch @@ -3,7 +3,7 @@ From: John Stultz <john.stultz@linaro.org> Date: Tue, 17 Jul 2012 17:49:21 -0400 Subject: [PATCH] ntp: Fix leap-second hrtimer livelock -This is a backport of 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d +commit 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d upstream. This should have been backported when it was commited, but I mistook the problem as requiring the ntp_lock changes diff --git a/queue/time-Move-common-updates-to-a-function.patch b/queue/time-Move-common-updates-to-a-function.patch index 318cf1d..9b66fdf 100644 --- a/queue/time-Move-common-updates-to-a-function.patch +++ b/queue/time-Move-common-updates-to-a-function.patch @@ -3,7 +3,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 17 Jul 2012 17:49:24 -0400 Subject: [PATCH] time: Move common updates to a function -This is a backport of cc06268c6a87db156af2daed6e96a936b955cc82 +commit cc06268c6a87db156af2daed6e96a936b955cc82 upstream. While not a bugfix itself, it allows following fixes to backport in a more straightforward manner. diff --git a/queue/timekeeping-Add-missing-update-call-in-timekeeping_r.patch b/queue/timekeeping-Add-missing-update-call-in-timekeeping_r.patch index b638e49..7b3a224 100644 --- a/queue/timekeeping-Add-missing-update-call-in-timekeeping_r.patch +++ b/queue/timekeeping-Add-missing-update-call-in-timekeeping_r.patch @@ -3,7 +3,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 17 Jul 2012 17:49:31 -0400 Subject: [PATCH] timekeeping: Add missing update call in timekeeping_resume() -This is a backport of 3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0 +commit 3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0 upstream. The leap second rework unearthed another issue of inconsistent data. diff --git a/queue/timekeeping-Fix-CLOCK_MONOTONIC-inconsistency-during.patch b/queue/timekeeping-Fix-CLOCK_MONOTONIC-inconsistency-during.patch index d636b0d..d0ad24a 100644 --- a/queue/timekeeping-Fix-CLOCK_MONOTONIC-inconsistency-during.patch +++ b/queue/timekeeping-Fix-CLOCK_MONOTONIC-inconsistency-during.patch @@ -4,7 +4,7 @@ Date: Tue, 17 Jul 2012 17:49:23 -0400 Subject: [PATCH] timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond -This is a backport of fad0c66c4bb836d57a5f125ecd38bed653ca863a +commit fad0c66c4bb836d57a5f125ecd38bed653ca863a upstream. which resolves a bug the previous commit. Commit 6b43ae8a61 (ntp: Fix leap-second hrtimer livelock) broke the diff --git a/queue/timekeeping-Fix-leapsecond-triggered-load-spike-issu.patch b/queue/timekeeping-Fix-leapsecond-triggered-load-spike-issu.patch index bb13b53..754b0b8 100644 --- a/queue/timekeeping-Fix-leapsecond-triggered-load-spike-issu.patch +++ b/queue/timekeeping-Fix-leapsecond-triggered-load-spike-issu.patch @@ -3,7 +3,7 @@ From: John Stultz <johnstul@us.ibm.com> Date: Tue, 17 Jul 2012 17:49:26 -0400 Subject: [PATCH] timekeeping: Fix leapsecond triggered load spike issue -This is a backport of 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51 +commit 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51 upstream. The timekeeping code misses an update of the hrtimer subsystem after a leap second happened. Due to that timers based on CLOCK_REALTIME are diff --git a/queue/timekeeping-Maintain-ktime_t-based-offsets-for-hrtim.patch b/queue/timekeeping-Maintain-ktime_t-based-offsets-for-hrtim.patch index 2c144f7..b934912 100644 --- a/queue/timekeeping-Maintain-ktime_t-based-offsets-for-hrtim.patch +++ b/queue/timekeeping-Maintain-ktime_t-based-offsets-for-hrtim.patch @@ -3,7 +3,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 17 Jul 2012 17:49:27 -0400 Subject: [PATCH] timekeeping: Maintain ktime_t based offsets for hrtimers -This is a backport of 5b9fe759a678e05be4937ddf03d50e950207c1c0 +commit 5b9fe759a678e05be4937ddf03d50e950207c1c0 upstream. We need to update the hrtimer clock offsets from the hrtimer interrupt context. To avoid conversions from timespec to ktime_t maintain a diff --git a/queue/timekeeping-Provide-hrtimer-update-function.patch b/queue/timekeeping-Provide-hrtimer-update-function.patch index 668fcd0..5333484 100644 --- a/queue/timekeeping-Provide-hrtimer-update-function.patch +++ b/queue/timekeeping-Provide-hrtimer-update-function.patch @@ -3,7 +3,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 17 Jul 2012 17:49:29 -0400 Subject: [PATCH] timekeeping: Provide hrtimer update function -This is a backport of f6c06abfb3972ad4914cef57d8348fcb2932bc3b +commit f6c06abfb3972ad4914cef57d8348fcb2932bc3b upstream. To finally fix the infamous leap second issue and other race windows caused by functions which change the offsets between the various time |