X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ftime%2Fntp.c;h=4c8d85421d24b84429be27e096611ad86a3e686d;hb=cc584b213f252bf698849cf4be2377cd3ec7501a;hp=5125ddd8196ba3cffb2fd683c2fd3abdac0a695b;hpb=23dd7bb09bd8d7efd8a602aed97b93d52f85e675;p=linux-2.6-omap-h63xx.git diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 5125ddd8196..4c8d85421d2 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -142,8 +142,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer) time_state = TIME_OOP; printk(KERN_NOTICE "Clock: " "inserting leap second 23:59:60 UTC\n"); - leap_timer.expires = ktime_add_ns(leap_timer.expires, - NSEC_PER_SEC); + hrtimer_add_expires_ns(&leap_timer, NSEC_PER_SEC); res = HRTIMER_RESTART; break; case TIME_DEL: