ktime: Kill non-scalar ktime_t implementation for 2038

[linux.git] / kernel / time / timekeeping.c

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index b94fa3652aaa8325103157668976ab2e0ce1bda3..cafef242d8f9886991c5f388a65cd375c955ec62 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -344,11 +344,8 @@ ktime_t ktime_get(void)
                nsecs = timekeeping_get_ns(tk) + tk->wall_to_monotonic.tv_nsec;
 
        } while (read_seqcount_retry(&timekeeper_seq, seq));
-       /*
-        * Use ktime_set/ktime_add_ns to create a proper ktime on
-        * 32-bit architectures without CONFIG_KTIME_SCALAR.
-        */
-       return ktime_add_ns(ktime_set(secs, 0), nsecs);
+
+       return ktime_set(secs, nsecs);
 }
 EXPORT_SYMBOL_GPL(ktime_get);