NTP: remove clock_was_set() call to prevent deadlock

[sfrench/cifs-2.6.git] / kernel / time / ntp.c

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index cb25649c6f505acaeb19cb28ec5c3464cf3027bf..cf53bb5814cb88b087fd1dcbfc064223b537d46a 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -11,6 +11,8 @@
 #include <linux/mm.h>
 #include <linux/time.h>
 #include <linux/timex.h>
+#include <linux/jiffies.h>
+#include <linux/hrtimer.h>
 
 #include <asm/div64.h>
 #include <asm/timex.h>
@@ -120,7 +122,6 @@ void second_overflow(void)
                         */
                        time_interpolator_update(-NSEC_PER_SEC);
                        time_state = TIME_OOP;
-                       clock_was_set();
                        printk(KERN_NOTICE "Clock: inserting leap second "
                                        "23:59:60 UTC\n");
                }
@@ -135,7 +136,6 @@ void second_overflow(void)
                         */
                        time_interpolator_update(NSEC_PER_SEC);
                        time_state = TIME_WAIT;
-                       clock_was_set();
                        printk(KERN_NOTICE "Clock: deleting leap second "
                                        "23:59:59 UTC\n");
                }