summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2022-04-23 21:11:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-25 11:46:38 +0200
commitd969c9880bafd6e4986f125720da8b238a1aadd1 (patch)
treedd690212fabed634bc4eb1b3670d9f1cf9763e32 /arch/alpha
parentfaf62b743975f623677ec0f59cb2f2f750cd35d1 (diff)
downloadlinux-stable-d969c9880bafd6e4986f125720da8b238a1aadd1.tar.gz
linux-stable-d969c9880bafd6e4986f125720da8b238a1aadd1.tar.bz2
linux-stable-d969c9880bafd6e4986f125720da8b238a1aadd1.zip
alpha: define get_cycles macro for arch-override
commit 1097710bc9660e1e588cf2186a35db3d95c4d258 upstream. Alpha 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: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Acked-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/include/asm/timex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/timex.h b/arch/alpha/include/asm/timex.h
index b565cc6f408e..f89798da8a14 100644
--- a/arch/alpha/include/asm/timex.h
+++ b/arch/alpha/include/asm/timex.h
@@ -28,5 +28,6 @@ static inline cycles_t get_cycles (void)
__asm__ __volatile__ ("rpcc %0" : "=r"(ret));
return ret;
}
+#define get_cycles get_cycles
#endif