Skip to content

Commit 1132e6d

Browse files
ionela-voinescurafaeljw
authored andcommitted
x86, ACPI: rename init_freq_invariance_cppc() to arch_init_invariance_cppc()
init_freq_invariance_cppc() was called in acpi_cppc_processor_probe(), after CPU performance information and controls were populated from the per-cpu _CPC objects. But these _CPC objects provide information that helps with both CPU (u-arch) and frequency invariance. Therefore, change the function name to a more generic one, while adding the arch_ prefix, as this function is expected to be defined differently by different architectures. Signed-off-by: Ionela Voinescu <ionela.voinescu@arm.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Valentin Schneider <valentin.schneider@arm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent e702196 commit 1132e6d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/x86/include/asm/topology.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static inline void init_freq_invariance(bool secondary, bool cppc_ready)
227227

228228
#ifdef CONFIG_ACPI_CPPC_LIB
229229
void init_freq_invariance_cppc(void);
230-
#define init_freq_invariance_cppc init_freq_invariance_cppc
230+
#define arch_init_invariance_cppc init_freq_invariance_cppc
231231

232232
bool amd_set_max_freq_ratio(u64 *ratio);
233233
#else

drivers/acpi/cppc_acpi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,8 +633,8 @@ static bool is_cppc_supported(int revision, int num_ent)
633633
* )
634634
*/
635635

636-
#ifndef init_freq_invariance_cppc
637-
static inline void init_freq_invariance_cppc(void) { }
636+
#ifndef arch_init_invariance_cppc
637+
static inline void arch_init_invariance_cppc(void) { }
638638
#endif
639639

640640
/**
@@ -816,7 +816,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
816816
goto out_free;
817817
}
818818

819-
init_freq_invariance_cppc();
819+
arch_init_invariance_cppc();
820820

821821
kfree(output.pointer);
822822
return 0;

0 commit comments

Comments
 (0)