[PATCH RT 0/2] Linux 3.4.94-rt117-rc1

[PATCH RT 0/2] Linux 3.4.94-rt117-rc1

[Steven Rostedt]

Dear RT Folks,

This is the RT stable review cycle of patch 3.4.94-rt117-rc1.

Please scream at me if I messed something up. Please test the patches too.

The -rc release will be uploaded to kernel.org and will be deleted when
the final release is out. This is just a review release (or release candidate).

The pre-releases will not be pushed to the git repository, only the
final release is.

If all goes well, this patch will be converted to the next main release
on 7/7/2014.

Enjoy,

-- Steve


To build 3.4.94-rt117-rc1 directly, the following patches should be applied:

  http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz

  http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.4.94.xz

  http://www.kernel.org/pub/linux/kernel/projects/rt/3.4/patch-3.4.94-rt117-rc1.patch.xz

You can also build from 3.4.94-rt116 by applying the incremental patch:

http://www.kernel.org/pub/linux/kernel/projects/rt/3.4/incr/patch-3.4.94-rt116-rt117-rc1.patch.xz


Changes from 3.4.94-rt116:

---


Ben Hutchings (1):
      Fix latency histogram after "hrtimer: Set expiry time before switch_hrtimer_base()"

Steven Rostedt (Red Hat) (1):
      Linux 3.4.94-rt117-rc1

----
 kernel/hrtimer.c | 10 +++++-----
 localversion-rt  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

[PATCH RT 1/2] Fix latency histogram after "hrtimer: Set expiry time before switch_hrtimer_base()"

[Steven Rostedt]

[-- Attachment #1: 0001-Fix-latency-histogram-after-hrtimer-Set-expiry-time-.patch --]
[-- Type: text/plain, Size: 1344 bytes --]

3.4.94-rt117-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Ben Hutchings <ben@decadent.org.uk>

In an rt-kernel with CONFIG_MISSED_TIMER_OFFSETS_HIST enabled,
__hrtimer_start_range_ns() now crashes, as new_base is not assigned
before it is used.

Tested-by: Carsten Emde <C.Emde@osadl.org>
Cc: stable-rt@vger.kernel.org
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/hrtimer.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b62a3a7541c7..3f7d3b5b0717 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1038,6 +1038,11 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
 #endif
 	}
 
+	hrtimer_set_expires_range_ns(timer, tim, delta_ns);
+
+	/* Switch the timer base, if necessary: */
+	new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
+
 #ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
 	{
 		ktime_t now = new_base->get_time();
@@ -1049,11 +1054,6 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
 	}
 #endif
 
-	hrtimer_set_expires_range_ns(timer, tim, delta_ns);
-
-	/* Switch the timer base, if necessary: */
-	new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);

[PATCH RT 2/2] Linux 3.4.94-rt117-rc1

[Steven Rostedt]

[-- Attachment #1: 0002-Linux-3.4.94-rt117-rc1.patch --]
[-- Type: text/plain, Size: 414 bytes --]

3.4.94-rt117-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

---
 localversion-rt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/localversion-rt b/localversion-rt
index 34eca4e89203..d5f654342ac4 100644
--- a/localversion-rt
+++ b/localversion-rt
@@ -1 +1 @@
--rt116
+-rt117-rc1
-- 
2.0.0