aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/hrtimer.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-12 20:02:18 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-12 20:02:18 -0400
commit9277bf4b4f94655eef177d0daffa90a47c51eb62 (patch)
tree569b5a13b3f7030a603460d8d9ded035a6f7f48f /kernel/hrtimer.c
parent897493504addc5609f04a2c4f73c37ab972c29b2 (diff)
parent49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff)
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r--kernel/hrtimer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index ce669174f355..1decafbb6b1a 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1091,11 +1091,10 @@ EXPORT_SYMBOL_GPL(hrtimer_cancel);
1091 */ 1091 */
1092ktime_t hrtimer_get_remaining(const struct hrtimer *timer) 1092ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
1093{ 1093{
1094 struct hrtimer_clock_base *base;
1095 unsigned long flags; 1094 unsigned long flags;
1096 ktime_t rem; 1095 ktime_t rem;
1097 1096
1098 base = lock_hrtimer_base(timer, &flags); 1097 lock_hrtimer_base(timer, &flags);
1099 rem = hrtimer_expires_remaining(timer); 1098 rem = hrtimer_expires_remaining(timer);
1100 unlock_hrtimer_base(timer, &flags); 1099 unlock_hrtimer_base(timer, &flags);
1101 1100