Quellcode durchsuchen

ntp: Correct TAI offset during leap second

When repeating a UTC time value during a leap second (when the UTC
time should be 23:59:60), the TAI timescale should not stop. The kernel
NTP code increments the TAI offset one second too late. This patch fixes
the issue by incrementing the offset during the leap second itself.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Richard Cochran vor 13 Jahren
Ursprung
Commit
dd48d708ff
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. 1 1
      kernel/time/ntp.c

+ 1 - 1
kernel/time/ntp.c

@@ -412,6 +412,7 @@ int second_overflow(unsigned long secs)
 		if (secs % 86400 == 0) {
 		if (secs % 86400 == 0) {
 			leap = -1;
 			leap = -1;
 			time_state = TIME_OOP;
 			time_state = TIME_OOP;
+			time_tai++;
 			printk(KERN_NOTICE
 			printk(KERN_NOTICE
 				"Clock: inserting leap second 23:59:60 UTC\n");
 				"Clock: inserting leap second 23:59:60 UTC\n");
 		}
 		}
@@ -426,7 +427,6 @@ int second_overflow(unsigned long secs)
 		}
 		}
 		break;
 		break;
 	case TIME_OOP:
 	case TIME_OOP:
-		time_tai++;
 		time_state = TIME_WAIT;
 		time_state = TIME_WAIT;
 		break;
 		break;