diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
| commit | f3fbba6efbab93b9850821d41a75b02286d18315 (patch) | |
| tree | e2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /kernel/hrtimer.c | |
| parent | 15c5ab607045e278ebf4d2ca4aea2250617d50ca (diff) | |
| parent | 147fcf1c211f1a87bf4d0711b7e9637f3d6ce080 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 3 |
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); */ ktime_t hrtimer_get_remaining(const struct hrtimer *timer) { - struct hrtimer_clock_base *base; unsigned long flags; ktime_t rem; - base = lock_hrtimer_base(timer, &flags); + lock_hrtimer_base(timer, &flags); rem = hrtimer_expires_remaining(timer); unlock_hrtimer_base(timer, &flags); |