diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-06-28 23:34:48 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-01 19:00:15 -0400 |
| commit | 13b99c67f147e3fea96bc17abebd1f8d4dd7c94f (patch) | |
| tree | 9ab1620024f9538d85fb24704905eefbe502df45 | |
| parent | b2c02006a4f5d7d213d18c53df6bc67df7ff7f7a (diff) | |
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 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); - timer_stats_hrtimer_set_start_info(timer); leftmost = enqueue_hrtimer(timer, new_base); |