diff mbox

[1/2] timekeeping: Provide internal function __ktime_get_real_seconds

Message ID 1449980659-2948-2-git-send-email-chao.deng@linaro.org
State Superseded
Headers show

Commit Message

Deng Chao Dec. 13, 2015, 4:24 a.m. UTC 
In order to fix Y2038 issues in the ntp code we will need replace
get_seconds() with ktime_get_real_seconds() but as the ntp code uses
the timekeeping lock which is also used by ktime_get_real_seconds(),
we need a version without locking.
Add a new function __ktime_get_real_seconds() in timekeeping to
do this.

Reviewed-by: John Stultz <john.stultz@linaro.org>

Signed-off-by: DengChao <chao.deng@linaro.org>

---
 kernel/time/timekeeping.c          | 13 +++++++++++++
 kernel/time/timekeeping_internal.h |  2 ++
 2 files changed, 15 insertions(+)

-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Comments

John Stultz Dec. 16, 2015, 6:11 a.m. UTC | #1 
On Sat, Dec 12, 2015 at 8:24 PM, DengChao <chao.deng@linaro.org> wrote:
> In order to fix Y2038 issues in the ntp code we will need replace

> get_seconds() with ktime_get_real_seconds() but as the ntp code uses

> the timekeeping lock which is also used by ktime_get_real_seconds(),

> we need a version without locking.

> Add a new function __ktime_get_real_seconds() in timekeeping to

> do this.

>

> Reviewed-by: John Stultz <john.stultz@linaro.org>

> Signed-off-by: DengChao <chao.deng@linaro.org>


Queued for testing. Thanks for sending this in.
-john
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index d563c19..55acadb 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -846,6 +846,19 @@  time64_t ktime_get_real_seconds(void)
 }
 EXPORT_SYMBOL_GPL(ktime_get_real_seconds);
 
+/**
+ * __ktime_get_real_seconds - The same as ktime_get_real_seconds
+ * but without the sequence counter protect. This internal function
+ * is called just when timekeeping lock is already held.
+ */
+time64_t __ktime_get_real_seconds(void)
+{
+	struct timekeeper *tk = &tk_core.timekeeper;
+
+	return tk->xtime_sec;
+}
+
+
 #ifdef CONFIG_NTP_PPS
 
 /**
diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
index 4ea005a..e20466f 100644
--- a/kernel/time/timekeeping_internal.h
+++ b/kernel/time/timekeeping_internal.h
@@ -26,4 +26,6 @@  static inline cycle_t clocksource_delta(cycle_t now, cycle_t last, cycle_t mask)
 }
 #endif
 
+extern time64_t __ktime_get_real_seconds(void);
+
 #endif /* _TIMEKEEPING_INTERNAL_H */