sound: OSS: &&/|| typo in ad1848.c

[linux-2.6-omap-h63xx.git] / kernel / time / ntp.c

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 1a20715bfd6e4854e96e96eb1541f792767aeaa5..f5f793d924151736d92034ea0accd37fb354eef3 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -131,7 +131,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
 {
        enum hrtimer_restart res = HRTIMER_NORESTART;
 
-       write_seqlock_irq(&xtime_lock);
+       write_seqlock(&xtime_lock);
 
        switch (time_state) {
        case TIME_OK:
@@ -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:
@@ -165,7 +164,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
        }
        update_vsyscall(&xtime, clock);
 
-       write_sequnlock_irq(&xtime_lock);
+       write_sequnlock(&xtime_lock);
 
        return res;
 }