diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-04-23 21:11:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-30 09:33:40 +0200 |
| commit | c55a863c304e7301237c6c057350cf01d4ca9716 (patch) | |
| tree | e7eb5b3eb8dd75528f5d9432109ebc7937664d2a | |
| parent | 641d1fbd96676cb3c7c987aea4792349117fdbe6 (diff) | |
| download | linux-c55a863c304e7301237c6c057350cf01d4ca9716.tar.gz linux-c55a863c304e7301237c6c057350cf01d4ca9716.tar.bz2 linux-c55a863c304e7301237c6c057350cf01d4ca9716.zip | |
parisc: define get_cycles macro for arch-override
commit 8865bbe6ba1120e67f72201b7003a16202cd42be upstream.
PA-RISC 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>
Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/parisc/include/asm/timex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/timex.h b/arch/parisc/include/asm/timex.h index 06b510f8172e..b4622cb06a75 100644 --- a/arch/parisc/include/asm/timex.h +++ b/arch/parisc/include/asm/timex.h @@ -13,9 +13,10 @@ typedef unsigned long cycles_t; -static inline cycles_t get_cycles (void) +static inline cycles_t get_cycles(void) { return mfctl(16); } +#define get_cycles get_cycles #endif |