1 files changed, 8 insertions, 3 deletions

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f44e499e8fca..80666f6cd4f9 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -128,15 +128,20 @@ EXPORT_SYMBOL_GPL(ktime_get_ts);
 static void hrtimer_get_softirq_time(struct hrtimer_base *base)
 {
         ktime_t xtim, tomono;
+        struct timespec xts;
         unsigned long seq;
 
         do {
                 seq = read_seqbegin(&xtime_lock);
-                xtim = timespec_to_ktime(xtime);
-                tomono = timespec_to_ktime(wall_to_monotonic);
-
+#ifdef CONFIG_NO_HZ
+                getnstimeofday(&xts);
+#else
+                xts = xtime;
+#endif
         } while (read_seqretry(&xtime_lock, seq));
 
+        xtim = timespec_to_ktime(xts);
+        tomono = timespec_to_ktime(wall_to_monotonic);
         base[CLOCK_REALTIME].softirq_time = xtim;
         base[CLOCK_MONOTONIC].softirq_time = ktime_add(xtim, tomono);
 }