xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390: define get_cycles macro for arch-override

Browse Source 
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 <tglx@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jason A. Donenfeld
2022-04-23 21:11:41 +02:00
committed by Greg Kroah-Hartman
parent c895438b17
commit 641d1fbd96
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/include/asm/timex.h
View File

@@ -172,6 +172,7 @@ static inline cycles_t get_cycles(void)
{ {
return (cycles_t) get_tod_clock() >> 2; return (cycles_t) get_tod_clock() >> 2;
} }
#define get_cycles get_cycles
int get_phys_clock(unsigned long *clock); int get_phys_clock(unsigned long *clock);
void init_cpu_timer(void); void init_cpu_timer(void);