diff options
Diffstat (limited to 'kernel/itimer.c')
-rw-r--r-- | kernel/itimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c index 204ed7939e75..9cefe1d1eb13 100644 --- a/kernel/itimer.c +++ b/kernel/itimer.c | |||
@@ -128,7 +128,7 @@ asmlinkage long sys_getitimer(int which, struct itimerval __user *value) | |||
128 | /* | 128 | /* |
129 | * The timer is automagically restarted, when interval != 0 | 129 | * The timer is automagically restarted, when interval != 0 |
130 | */ | 130 | */ |
131 | int it_real_fn(struct hrtimer *timer) | 131 | enum hrtimer_restart it_real_fn(struct hrtimer *timer) |
132 | { | 132 | { |
133 | struct signal_struct *sig = | 133 | struct signal_struct *sig = |
134 | container_of(timer, struct signal_struct, real_timer); | 134 | container_of(timer, struct signal_struct, real_timer); |
@@ -235,7 +235,7 @@ again: | |||
235 | timeval_to_ktime(value->it_interval); | 235 | timeval_to_ktime(value->it_interval); |
236 | expires = timeval_to_ktime(value->it_value); | 236 | expires = timeval_to_ktime(value->it_value); |
237 | if (expires.tv64 != 0) | 237 | if (expires.tv64 != 0) |
238 | hrtimer_start(timer, expires, HRTIMER_REL); | 238 | hrtimer_start(timer, expires, HRTIMER_MODE_REL); |
239 | spin_unlock_irq(&tsk->sighand->siglock); | 239 | spin_unlock_irq(&tsk->sighand->siglock); |
240 | break; | 240 | break; |
241 | case ITIMER_VIRTUAL: | 241 | case ITIMER_VIRTUAL: |