aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2015-04-21 17:52:37 -0500
committerGary S. Robertson <gary.robertson@linaro.org>2015-07-22 16:19:09 -0500
commite33823607da84625db9f1a2e4eb02c578d240e72 (patch)
treeb881ce7af955fe88d9480a9f6c555dfd903a91c0
parent367845cf58b39bf10493a8a0d6d7fc1398603f64 (diff)
hrtimer.c: remove extraneous braceslinux-lng-preempt-rt-3.18.13-2015.07
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
-rw-r--r--kernel/time/hrtimer.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index f269baf68d90..bb71bab7dd3f 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1071,14 +1071,12 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
timer->state |= (!!(mode & HRTIMER_MODE_PINNED)) << HRTIMER_PINNED_SHIFT;
#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
- {
- ktime_t now = new_base->get_time();
+ ktime_t now = new_base->get_time();
- if (ktime_to_ns(tim) < ktime_to_ns(now))
- timer->praecox = now;
- else
- timer->praecox = ktime_set(0, 0);
- }
+ if (ktime_to_ns(tim) < ktime_to_ns(now))
+ timer->praecox = now;
+ else
+ timer->praecox = ktime_set(0, 0);
#endif
leftmost = enqueue_hrtimer(timer, new_base);