The only remaining usage of get_cycles() is to provide random_get_entropy().
Switch m68k 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: Geert Uytterhoeven <[email protected]> Cc: [email protected] --- arch/m68k/Kconfig | 1 + arch/m68k/amiga/config.c | 1 + arch/m68k/include/asm/random.h | 14 ++++++++++++++ arch/m68k/include/asm/timex.h | 25 ------------------------- arch/m68k/kernel/time.c | 2 +- 5 files changed, 17 insertions(+), 26 deletions(-) --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -8,6 +8,7 @@ config M68K select ARCH_HAS_CPU_FINALIZE_INIT if MMU select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DMA_PREP_COHERENT if M68K_NONCOHERENT_DMA && !COLDFIRE + select ARCH_HAS_RANDOM_ENTROPY select ARCH_HAS_SYNC_DMA_FOR_DEVICE if M68K_NONCOHERENT_DMA select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS select ARCH_MIGHT_HAVE_PC_PARPORT if ISA --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -36,6 +36,7 @@ #include <asm/machdep.h> #include <asm/io.h> #include <asm/config.h> +#include <asm/random.h> #include "amiga.h" --- /dev/null +++ b/arch/m68k/include/asm/random.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASMm68K_RANDOM_H +#define _ASMm68K_RANDOM_H + +extern unsigned long (*mach_random_get_entropy)(void); + +static inline unsigned long random_get_entropy(void) +{ + if (mach_random_get_entropy) + return mach_random_get_entropy(); + return random_get_entropy_fallback(); +} + +#endif --- a/arch/m68k/include/asm/timex.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * linux/include/asm-m68k/timex.h - * - * m68k architecture timex specifications - */ -#ifndef _ASMm68K_TIMEX_H -#define _ASMm68K_TIMEX_H - -static inline cycles_t get_cycles(void) -{ - return 0; -} - -extern unsigned long (*mach_random_get_entropy)(void); - -static inline unsigned long random_get_entropy(void) -{ - if (mach_random_get_entropy) - return mach_random_get_entropy(); - return random_get_entropy_fallback(); -} -#define random_get_entropy random_get_entropy - -#endif --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -26,12 +26,12 @@ #include <asm/machdep.h> #include <asm/io.h> #include <asm/irq_regs.h> +#include <asm/random.h> #include <linux/time.h> #include <linux/timex.h> #include <linux/profile.h> - unsigned long (*mach_random_get_entropy)(void); EXPORT_SYMBOL_GPL(mach_random_get_entropy);
