Commit-ID: 90bf361ceae28dee50a584c3dd4c1a96178d982c Gitweb: http://git.kernel.org/tip/90bf361ceae28dee50a584c3dd4c1a96178d982c Author: John Stultz <john.stu...@linaro.org> AuthorDate: Thu, 11 Jun 2015 15:54:54 -0700 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Fri, 12 Jun 2015 11:15:49 +0200
ntp: Introduce and use SECS_PER_DAY macro instead of 86400 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.stu...@linaro.org> Cc: Prarit Bhargava <pra...@redhat.com> Cc: Daniel Bristot de Oliveira <bris...@redhat.com> Cc: Richard Cochran <richardcoch...@gmail.com> Cc: Jan Kara <j...@suse.cz> Cc: Jiri Bohac <jbo...@suse.cz> Cc: Ingo Molnar <mi...@kernel.org> Link: http://lkml.kernel.org/r/1434063297-28657-3-git-send-email-john.stu...@linaro.org Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- kernel/time/ntp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 7a68100..7aa2161 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
