From a2af70ccf45c36df7012533fa0819ebc96b1fb15 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 3 Jul 2007 20:05:20 +0200
Subject: [PATCH] --- yaml --- r: 58175 b: refs/heads/master c:
 746976a301ac9c9aa10d7d42454f8d6cdad8ff2b h: refs/heads/master i:   58173:
 7a5c84b3e333e111d331583c87f826b7f40cb4a3   58171:
 5fb77a4b9ce5347fe431c316b54c2c0dadec98f9   58167:
 2017eda40dc70de75e605e4b74b6311691a8f2a4   58159:
 74273362b7dd04e7ec5ea7e3f09c33732be227f3   58143:
 4833c63a1a751020f3eca6020f2a57df917502c7   58111:
 aeda7c67a2ba0d205f932c91182254f33bd06665 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/time/ntp.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f5f43e422c9f..4d262997a72c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 872aad45d6174570dd2e1defc3efee50f2cfcc72
+refs/heads/master: 746976a301ac9c9aa10d7d42454f8d6cdad8ff2b
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
index 87aa5ff931e0..cf53bb5814cb 100644
--- a/trunk/kernel/time/ntp.c
+++ b/trunk/kernel/time/ntp.c
@@ -122,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");
 		}
@@ -137,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");
 		}