aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/itimer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/time/itimer.c')
-rw-r--r--kernel/time/itimer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index a45afb7277c2..8c89143f9ebf 100644
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -34,10 +34,10 @@ static struct timeval itimer_get_remtime(struct hrtimer *timer)
34 * then we return 0 - which is correct. 34 * then we return 0 - which is correct.
35 */ 35 */
36 if (hrtimer_active(timer)) { 36 if (hrtimer_active(timer)) {
37 if (rem.tv64 <= 0) 37 if (rem <= 0)
38 rem.tv64 = NSEC_PER_USEC; 38 rem = NSEC_PER_USEC;
39 } else 39 } else
40 rem.tv64 = 0; 40 rem = 0;
41 41
42 return ktime_to_timeval(rem); 42 return ktime_to_timeval(rem);
43} 43}
@@ -216,12 +216,12 @@ again:
216 goto again; 216 goto again;
217 } 217 }
218 expires = timeval_to_ktime(value->it_value); 218 expires = timeval_to_ktime(value->it_value);
219 if (expires.tv64 != 0) { 219 if (expires != 0) {
220 tsk->signal->it_real_incr = 220 tsk->signal->it_real_incr =
221 timeval_to_ktime(value->it_interval); 221 timeval_to_ktime(value->it_interval);
222 hrtimer_start(timer, expires, HRTIMER_MODE_REL); 222 hrtimer_start(timer, expires, HRTIMER_MODE_REL);
223 } else 223 } else
224 tsk->signal->it_real_incr.tv64 = 0; 224 tsk->signal->it_real_incr = 0;
225 225
226 trace_itimer_state(ITIMER_REAL, value, 0); 226 trace_itimer_state(ITIMER_REAL, value, 0);
227 spin_unlock_irq(&tsk->sighand->siglock); 227 spin_unlock_irq(&tsk->sighand->siglock);