1 files changed, 19 insertions, 13 deletions

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 419a52cecd20..33db43a39515 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -165,21 +165,21 @@ static inline void pps_set_freq(s64 freq)
 
 static inline int is_error_status(int status)
 {
-        return (time_status & (STA_UNSYNC|STA_CLOCKERR))
+        return (status & (STA_UNSYNC|STA_CLOCKERR))
                 /* PPS signal lost when either PPS time or
                  * PPS frequency synchronization requested
                  */
-                || ((time_status & (STA_PPSFREQ|STA_PPSTIME))
-                        && !(time_status & STA_PPSSIGNAL))
+                || ((status & (STA_PPSFREQ|STA_PPSTIME))
+                        && !(status & STA_PPSSIGNAL))
                 /* PPS jitter exceeded when
                  * PPS time synchronization requested */
-                || ((time_status & (STA_PPSTIME|STA_PPSJITTER))
+                || ((status & (STA_PPSTIME|STA_PPSJITTER))
                         == (STA_PPSTIME|STA_PPSJITTER))
                 /* PPS wander exceeded or calibration error when
                  * PPS frequency synchronization requested
                  */
-                || ((time_status & STA_PPSFREQ)
-                        && (time_status & (STA_PPSWANDER|STA_PPSERROR)));
+                || ((status & STA_PPSFREQ)
+                        && (status & (STA_PPSWANDER|STA_PPSERROR)));
 }
 
 static inline void pps_fill_timex(struct timex *txc)
@@ -786,8 +786,9 @@ static long hardpps_update_freq(struct pps_normtime freq_norm)
                 time_status |= STA_PPSERROR;
                 pps_errcnt++;
                 pps_dec_freq_interval();
-                pr_err("hardpps: PPSERROR: interval too long - %ld s\n",
-                                freq_norm.sec);
+                printk_deferred(KERN_ERR
+                        "hardpps: PPSERROR: interval too long - %ld s\n",
+                        freq_norm.sec);
                 return 0;
         }
 
@@ -800,7 +801,8 @@ static long hardpps_update_freq(struct pps_normtime freq_norm)
         delta = shift_right(ftemp - pps_freq, NTP_SCALE_SHIFT);
         pps_freq = ftemp;
         if (delta > PPS_MAXWANDER || delta < -PPS_MAXWANDER) {
-                pr_warning("hardpps: PPSWANDER: change=%ld\n", delta);
+                printk_deferred(KERN_WARNING
+                                "hardpps: PPSWANDER: change=%ld\n", delta);
                 time_status |= STA_PPSWANDER;
                 pps_stbcnt++;
                 pps_dec_freq_interval();
@@ -844,8 +846,9 @@ static void hardpps_update_phase(long error)
          * the time offset is updated.
          */
         if (jitter > (pps_jitter << PPS_POPCORN)) {
-                pr_warning("hardpps: PPSJITTER: jitter=%ld, limit=%ld\n",
-                       jitter, (pps_jitter << PPS_POPCORN));
+                printk_deferred(KERN_WARNING
+                                "hardpps: PPSJITTER: jitter=%ld, limit=%ld\n",
+                                jitter, (pps_jitter << PPS_POPCORN));
                 time_status |= STA_PPSJITTER;
                 pps_jitcnt++;
         } else if (time_status & STA_PPSTIME) {
@@ -902,7 +905,7 @@ void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
                 time_status |= STA_PPSJITTER;
                 /* restart the frequency calibration interval */
                 pps_fbase = *raw_ts;
-                pr_err("hardpps: PPSJITTER: bad pulse\n");
+                printk_deferred(KERN_ERR "hardpps: PPSJITTER: bad pulse\n");
                 return;
         }
 
@@ -923,7 +926,10 @@ void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
 
 static int __init ntp_tick_adj_setup(char *str)
 {
-        ntp_tick_adj = simple_strtol(str, NULL, 0);
+        int rc = kstrtol(str, 0, (long *)&ntp_tick_adj);
+
+        if (rc)
+                return rc;
         ntp_tick_adj <<= NTP_SCALE_SHIFT;
 
         return 1;