[SPARC]: Fix do_gettimeofday() as per cset 1.1347.1.17

diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 25e98c9d24793342888ba302cad6b0f5575e3c58..3bb97b4771bdc8a8753bd6be0565215b6eaf4fdd 100644 (file)
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -785,6 +785,15 @@ static void pci_do_gettimeofday(struct timeval *tv)
                        if (lost)
                                usec += lost * (1000000 / HZ);
                }
+
+               /*
+                * If time_adjust is negative then NTP is slowing the clock
+                * so make sure not to go into next possible interval.
+                * Better to lose some accuracy than have time go backwards..
+                */
+               if (unlikely(time_adjust < 0) && usec > tickadj)
+                       usec = tickadj;
+
                sec = xtime.tv_sec;
                usec += (xtime.tv_nsec / 1000);
        } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));

diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 5549a6fd172bf5071b6c3f846872303b5c0031e5..5566ad8a751ba57f574650dc9b938bf7d78caa21 100644 (file)
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -490,6 +490,15 @@ void do_gettimeofday(struct timeval *tv)
                        if (lost)
                                usec += lost * (1000000 / HZ);
                }
+
+               /*
+                * If time_adjust is negative then NTP is slowing the clock
+                * so make sure not to go into next possible interval.
+                * Better to lose some accuracy than have time go backwards..
+                */
+               if (unlikely(time_adjust < 0) && usec > tickadj)
+                       usec = tickadj;
+
                sec = xtime.tv_sec;
                usec += (xtime.tv_nsec / 1000);
        } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));

diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 4871140c13ed5ac4048ad60e248c5f0a01669e7d..d06bcc0562f132fbed930601fd5f4e2af0ba180d 100644 (file)
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1149,6 +1149,15 @@ void do_gettimeofday(struct timeval *tv)
                        if (lost)
                                usec += lost * (1000000 / HZ);
                }
+
+               /*
+                * If time_adjust is negative then NTP is slowing the clock
+                * so make sure not to go into next possible interval.
+                * Better to lose some accuracy than have time go backwards..
+                */
+               if (unlikely(time_adjust < 0) && usec > tickadj)
+                       usec = tickadj;
+
                sec = xtime.tv_sec;
                usec += (xtime.tv_nsec / 1000);
        } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));