Messages in this thread Patch in this message | | | Date | Mon, 02 May 2022 07:27:00 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: x86/cleanups] x86/aperfperf: Make it correct on 32bit and UP kernels |
| |
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 1ff2fb982c52ed6c3478adc944441d6ea065d8fb Gitweb: https://git.kernel.org/tip/1ff2fb982c52ed6c3478adc944441d6ea065d8fb Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Mon, 02 May 2022 09:01:55 +02:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Mon, 02 May 2022 09:19:05 +02:00
x86/aperfperf: Make it correct on 32bit and UP kernels
The utilization of arch_scale_freq_tick() for CPU frequency readouts is incomplete as it failed to move the function prototype and the define out of the CONFIG_SMP && CONFIG_X86_64 #ifdef.
Make them unconditionally available.
Fixes: bb6e89df9028 ("x86/aperfmperf: Make parts of the frequency invariance code unconditional") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/lkml/202205010106.06xRBR2C-lkp@intel.com --- arch/x86/include/asm/topology.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 1b2553d..458c891 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -212,9 +212,6 @@ static inline long arch_scale_freq_capacity(int cpu) } #define arch_scale_freq_capacity arch_scale_freq_capacity -extern void arch_scale_freq_tick(void); -#define arch_scale_freq_tick arch_scale_freq_tick - extern void arch_set_max_freq_ratio(bool turbo_disabled); extern void freq_invariance_set_perf_ratio(u64 ratio, bool turbo_disabled); #else @@ -222,6 +219,9 @@ static inline void arch_set_max_freq_ratio(bool turbo_disabled) { } static inline void freq_invariance_set_perf_ratio(u64 ratio, bool turbo_disabled) { } #endif +extern void arch_scale_freq_tick(void); +#define arch_scale_freq_tick arch_scale_freq_tick + #ifdef CONFIG_ACPI_CPPC_LIB void init_freq_invariance_cppc(void); #define arch_init_invariance_cppc init_freq_invariance_cppc
| |