From: Andrew Morton Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton --- kernel/kevent/kevent_timer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff -puN kernel/kevent/kevent_timer.c~kevent-timer-notifications-fix kernel/kevent/kevent_timer.c --- a/kernel/kevent/kevent_timer.c~kevent-timer-notifications-fix +++ a/kernel/kevent/kevent_timer.c @@ -33,7 +33,7 @@ struct kevent_timer struct kevent *ktimer_event; }; -static int kevent_timer_func(struct hrtimer *timer) +static enum hrtimer_restart kevent_timer_func(struct hrtimer *timer) { struct kevent_timer *t = container_of(timer, struct kevent_timer, ktimer); struct kevent *k = t->ktimer_event; @@ -55,7 +55,7 @@ static int kevent_timer_enqueue(struct k if (!t) return -ENOMEM; - hrtimer_init(&t->ktimer, CLOCK_MONOTONIC, HRTIMER_REL); + hrtimer_init(&t->ktimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); t->ktimer.expires = ktime_set(k->event.id.raw[0], k->event.id.raw[1]); t->ktimer.function = kevent_timer_func; t->ktimer_event = k; @@ -69,8 +69,7 @@ static int kevent_timer_enqueue(struct k if (err) goto err_out_st_fini; - printk("%s: jiffies: %lu, timer: %p.\n", __func__, jiffies, &t->ktimer); - hrtimer_start(&t->ktimer, t->ktimer.expires, HRTIMER_REL); + hrtimer_start(&t->ktimer, t->ktimer.expires, HRTIMER_MODE_REL); return 0; _