[RESEND] powerpc: xmon: use ktime_get_coarse_boottime64

Message ID 20180711125338.1365368-1-arnd@arndb.de
State New
Headers show
Series
  • [RESEND] powerpc: xmon: use ktime_get_coarse_boottime64
Related show

Commit Message

Arnd Bergmann July 11, 2018, 12:53 p.m.
get_monotonic_boottime() is deprecated, and may not be safe to call in
every context, as it has to read a hardware clocksource.

This changes xmon to print the time using ktime_get_coarse_boottime64()
instead, which avoids the old timespec type and the HW access.

Acked-by: Balbir Singh <bsingharora@gmail.com>

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
Originally sent Jun 18, but this hasn't appeared in linux-next yet.

Resending to make sure this is still on the radar. Please apply
to the powerpc git for 4.19
---
 arch/powerpc/xmon/xmon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.9.0

Comments

Michael Ellerman July 12, 2018, 6:28 a.m. | #1
Arnd Bergmann <arnd@arndb.de> writes:

> get_monotonic_boottime() is deprecated, and may not be safe to call in

> every context, as it has to read a hardware clocksource.

>

> This changes xmon to print the time using ktime_get_coarse_boottime64()

> instead, which avoids the old timespec type and the HW access.

>

> Acked-by: Balbir Singh <bsingharora@gmail.com>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

> Originally sent Jun 18, but this hasn't appeared in linux-next yet.

>

> Resending to make sure this is still on the radar. Please apply

> to the powerpc git for 4.19


I had applied it but forgot to push.

Should be there today.

cheers

Patch

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 47166ad2a669..45e3d0ec1246 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -918,13 +918,13 @@  static void remove_cpu_bpts(void)
 static void
 show_uptime(void)
 {
-	struct timespec uptime;
+	struct timespec64 uptime;
 
 	if (setjmp(bus_error_jmp) == 0) {
 		catch_memory_errors = 1;
 		sync();
 
-		get_monotonic_boottime(&uptime);
+		ktime_get_coarse_boottime_ts64(&uptime);
 		printf("Uptime: %lu.%.2lu seconds\n", (unsigned long)uptime.tv_sec,
 			((unsigned long)uptime.tv_nsec / (NSEC_PER_SEC/100)));