diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-01 15:02:30 -0700 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-05 21:35:13 -0700 |
| commit | cc584b213f252bf698849cf4be2377cd3ec7501a (patch) | |
| tree | 621ba11da6a2ab8598f9ed453836cd2c44192260 /kernel/time/ntp.c | |
| parent | 23dd7bb09bd8d7efd8a602aed97b93d52f85e675 (diff) | |
| download | op-kernel-dev-cc584b213f252bf698849cf4be2377cd3ec7501a.zip op-kernel-dev-cc584b213f252bf698849cf4be2377cd3ec7501a.tar.gz | |
hrtimer: convert kernel/* to the new hrtimer apis
In order to be able to do range hrtimers we need to use accessor functions
to the "expire" member of the hrtimer struct.
This patch converts kernel/* to these accessors.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'kernel/time/ntp.c')
| -rw-r--r-- | kernel/time/ntp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 5125ddd..4c8d854 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: |
