The only remaining usage of get_cycles() is to provide random_get_entropy().
Switch sparc over to the new scheme of selecting ARCH_HAS_RANDOM_ENTROPY and providing random_get_entropy() in asm/random.h. Remove asm/timex*.h as it has no functionality anymore. Signed-off-by: Thomas Gleixner <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: [email protected] --- arch/sparc/Kconfig | 1 + arch/sparc/include/asm/random.h | 15 +++++++++++++++ arch/sparc/include/asm/timex.h | 9 --------- arch/sparc/include/asm/timex_64.h | 15 --------------- arch/sparc/kernel/pcic.c | 1 - arch/sparc/kernel/time_32.c | 1 - arch/sparc/vdso/vclock_gettime.c | 1 - 7 files changed, 16 insertions(+), 27 deletions(-) --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -71,6 +71,7 @@ config SPARC64 def_bool 64BIT select ALTERNATE_USER_ADDRESS_SPACE select ARCH_HAS_DELAY_TIMER + select ARCH_HAS_RANDOM_ENTROPY select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_GRAPH_TRACER select HAVE_KRETPROBES --- /dev/null +++ b/arch/sparc/include/asm/random.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASMsparc_RANDOM_H +#define _ASMsparc_RANDOM_H + +#if defined(__sparc__) && defined(__arch64__) + +#include <asm/timer.h> + +static inline unsigned long random_get_entropy(void) +{ + return tick_ops->get_tick(); +} + +#endif +#endif --- a/arch/sparc/include/asm/timex.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef ___ASM_SPARC_TIMEX_H -#define ___ASM_SPARC_TIMEX_H -#if defined(__sparc__) && defined(__arch64__) -#include <asm/timex_64.h> -#else -#include <asm-generic/timex.h> -#endif -#endif --- a/arch/sparc/include/asm/timex_64.h +++ b/arch/sparc/include/asm/timex_64.h @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * linux/include/asm/timex.h - * - * sparc64 architecture timex specifications - */ -#ifndef _ASMsparc64_TIMEX_H -#define _ASMsparc64_TIMEX_H - -#include <asm/timer.h> - -/* Getting on the cycle counter on sparc64. */ -#define get_cycles() tick_ops->get_tick() - -#endif --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -33,7 +33,6 @@ #include <asm/oplib.h> #include <asm/prom.h> #include <asm/pcic.h> -#include <asm/timex.h> #include <asm/timer.h> #include <linux/uaccess.h> #include <asm/irq_regs.h> --- a/arch/sparc/kernel/time_32.c +++ b/arch/sparc/kernel/time_32.c @@ -37,7 +37,6 @@ #include <asm/mc146818rtc.h> #include <asm/oplib.h> -#include <asm/timex.h> #include <asm/timer.h> #include <asm/irq.h> #include <asm/io.h> --- a/arch/sparc/vdso/vclock_gettime.c +++ b/arch/sparc/vdso/vclock_gettime.c @@ -17,7 +17,6 @@ #include <linux/string.h> #include <asm/io.h> #include <asm/unistd.h> -#include <asm/timex.h> #include <asm/clocksource.h> #include <asm/vvar.h>
