[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 4.19 136/234] s390: define get_cycles macro for arch-override
From: "Jason A. Donenfeld" <>

commit 2e3df523256cb9836de8441e9c791a796759bb3c upstream.

S390x defines a get_cycles() function, but it does not do the usual
`#define get_cycles get_cycles` dance, making it impossible for generic
code to see if an arch-specific function was defined. While the
get_cycles() ifdef is not currently used, the following timekeeping
patch in this series will depend on the macro existing (or not existing)
when defining random_get_entropy().

Cc: Thomas Gleixner <>
Cc: Arnd Bergmann <>
Cc: Vasily Gorbik <>
Cc: Alexander Gordeev <>
Cc: Christian Borntraeger <>
Cc: Sven Schnelle <>
Acked-by: Heiko Carstens <>
Signed-off-by: Jason A. Donenfeld <>
Signed-off-by: Greg Kroah-Hartman <>
arch/s390/include/asm/timex.h | 1 +
1 file changed, 1 insertion(+)

--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
@@ -177,6 +177,7 @@ static inline cycles_t get_cycles(void)
return (cycles_t) get_tod_clock() >> 2;
+#define get_cycles get_cycles

int get_phys_clock(unsigned long *clock);
void init_cpu_timer(void);

 \ /
  Last update: 2022-06-23 20:09    [W:0.852 / U:0.752 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site