ntp: Introduce and use SECS_PER_DAY macro instead of 86400
authorJohn Stultz <john.stultz@linaro.org>
Thu, 11 Jun 2015 22:54:54 +0000 (15:54 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 12 Jun 2015 09:15:49 +0000 (11:15 +0200)
Currently the leapsecond logic uses what looks like magic values.

Improve this by defining SECS_PER_DAY and using that macro
to make the logic more clear.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Daniel Bristot de Oliveira <bristot@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jiri Bohac <jbohac@suse.cz>
Cc: Ingo Molnar <mingo@kernel.org>
Link: http://lkml.kernel.org/r/1434063297-28657-3-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/ntp.c

index 7a681003001c0ee75631e2c5c56e528ec0ea98df..7aa216188450ed71b77c78c1be28916c14cdb7fe 100644 (file)
@@ -35,6 +35,7 @@ unsigned long                 tick_nsec;
 static u64                     tick_length;
 static u64                     tick_length_base;
 
+#define SECS_PER_DAY           86400
 #define MAX_TICKADJ            500LL           /* usecs */
 #define MAX_TICKADJ_SCALED \
        (((MAX_TICKADJ * NSEC_PER_USEC) << NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ)
@@ -390,7 +391,7 @@ int second_overflow(unsigned long secs)
        case TIME_INS:
                if (!(time_status & STA_INS))
                        time_state = TIME_OK;
-               else if (secs % 86400 == 0) {
+               else if (secs % SECS_PER_DAY == 0) {
                        leap = -1;
                        time_state = TIME_OOP;
                        printk(KERN_NOTICE
@@ -400,7 +401,7 @@ int second_overflow(unsigned long secs)
        case TIME_DEL:
                if (!(time_status & STA_DEL))
                        time_state = TIME_OK;
-               else if ((secs + 1) % 86400 == 0) {
+               else if ((secs + 1) % SECS_PER_DAY == 0) {
                        leap = 1;
                        time_state = TIME_WAIT;
                        printk(KERN_NOTICE