OSDN Git Service

ntp: Use kstrtos64 for s64 variable
authorOndrej Mosnacek <omosnace@redhat.com>
Fri, 13 Jul 2018 12:06:41 +0000 (14:06 +0200)
committerJohn Stultz <john.stultz@linaro.org>
Thu, 19 Jul 2018 21:58:37 +0000 (14:58 -0700)
...instead of kstrtol with a dirty cast.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
kernel/time/ntp.c

index 3eddac2..a627cae 100644 (file)
@@ -1020,12 +1020,11 @@ void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_t
 
 static int __init ntp_tick_adj_setup(char *str)
 {
-       int rc = kstrtol(str, 0, (long *)&ntp_tick_adj);
-
+       int rc = kstrtos64(str, 0, &ntp_tick_adj);
        if (rc)
                return rc;
-       ntp_tick_adj <<= NTP_SCALE_SHIFT;
 
+       ntp_tick_adj <<= NTP_SCALE_SHIFT;
        return 1;
 }