diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-08 13:08:23 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-08 13:08:23 -1000 |
| commit | c7a8f2a504c396f229e6025eca609c4e66f44c8b (patch) | |
| tree | 51156334a0b3fc288ed9e9d34048976d41a882df /include | |
| parent | 1eb714c660eb136c47902d969fc162af9bdd52d0 (diff) | |
| parent | b79276dcac9124a79c8cf7cc8fbdd3d4c3c9a7c7 (diff) | |
Merge tag 'acpi-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Fix the ACPI processor driver initialization ordering after recent
changes to avoid calling init_freq_invariance_cppc() too early on AMD
platforms (Mario Limonciello)"
* tag 'acpi-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: processor: Move arch_init_invariance_cppc() call later
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/processor.h | 2 | ||||
| -rw-r--r-- | include/linux/arch_topology.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index e6f6074eadbf..a17e97e634a6 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -465,4 +465,6 @@ extern int acpi_processor_ffh_lpi_probe(unsigned int cpu); extern int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi); #endif +void acpi_processor_init_invariance_cppc(void); + #endif diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index b721f360d759..4a952c4885ed 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -11,10 +11,6 @@ void topology_normalize_cpu_scale(void); int topology_update_cpu_topology(void); -#ifdef CONFIG_ACPI_CPPC_LIB -void topology_init_cpu_capacity_cppc(void); -#endif - struct device_node; bool topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu); |