The only remaining non-architecture usage of get_cycles() is to provide random_get_entropy().
Switch parisc over to the new scheme of selecting ARCH_HAS_RANDOM_ENTROPY and providing random_get_entropy() in asm/random.h. Add 'asm/timex.h' includes to the relevant files, so the global include can be removed once all architectures are converted over. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Helge Deller <[email protected]> Cc: [email protected] --- arch/parisc/Kconfig | 1 + arch/parisc/include/asm/random.h | 12 ++++++++++++ arch/parisc/include/asm/timex.h | 6 ------ arch/parisc/kernel/processor.c | 1 + arch/parisc/kernel/time.c | 1 + 5 files changed, 15 insertions(+), 6 deletions(-) --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -16,6 +16,7 @@ config PARISC select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_UBSAN select ARCH_HAS_PTE_SPECIAL + select ARCH_HAS_RANDOM_ENTROPY select ARCH_NO_SG_CHAIN select ARCH_SPLIT_ARG64 if !64BIT select ARCH_SUPPORTS_HUGETLBFS if PA20 --- /dev/null +++ b/arch/parisc/include/asm/random.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASMPARISC_RANDOM_H +#define _ASMPARISC_RANDOM_H + +#include <asm/timex.h> + +static inline unsigned long random_get_entropy(void) +{ + return get_cycles(); +} + +#endif --- a/arch/parisc/include/asm/timex.h +++ b/arch/parisc/include/asm/timex.h @@ -1,9 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* - * linux/include/asm-parisc/timex.h - * - * PARISC architecture timex specifications - */ #ifndef _ASMPARISC_TIMEX_H #define _ASMPARISC_TIMEX_H @@ -13,6 +8,5 @@ static inline cycles_t get_cycles(void) { return mfctl(16); } -#define get_cycles get_cycles #endif --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c @@ -30,6 +30,7 @@ #include <asm/pdcpat.h> #include <asm/irq.h> /* for struct irq_region */ #include <asm/parisc-device.h> +#include <asm/timex.h> struct system_cpuinfo_parisc boot_cpu_data __ro_after_init; EXPORT_SYMBOL(boot_cpu_data); --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c @@ -17,6 +17,7 @@ #include <linux/platform_device.h> #include <asm/processor.h> #include <asm/pdcpat.h> +#include <asm/timex.h> static u64 cr16_clock_freq; static unsigned long clocktick;
