diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-06-28 23:34:48 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2017-02-08 10:03:37 -0500 |
| commit | b7f3d98040eca205275eb96e087d45a39225624d (patch) | |
| tree | a5d9fd29f4273bbe5f436dee930407f39e609ff6 | |
| parent | ed24fdb332b34bca77c08e7987f1aae187ebf406 (diff) | |
| download | linux-stable-rt-b7f3d98040eca205275eb96e087d45a39225624d.tar.gz | |
Fix latency histogram after "hrtimer: Set expiry time before switch_hrtimer_base()"
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>
| -rw-r--r-- | kernel/hrtimer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 15e7b0fab5d69d..fc5e3b149114be 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1106,6 +1106,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(); @@ -1117,11 +1122,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); - timer_stats_hrtimer_set_start_info(timer); leftmost = enqueue_hrtimer(timer, new_base); |