Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 8ff15e5d486b..f5f793d92415 100644
--- 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:
@@ -164,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;
 }