diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:37:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:37:01 +0200 |
| commit | 2fb8414e644b133a9c3250f408232af99da256a4 (patch) | |
| tree | 62212fe1b6dec3949a47ac6d92f3070842ab9ae2 /arch/x86/kernel/acpi/cppc.c | |
| parent | 821f82125c47217390099532b09bd09cee9adaac (diff) | |
| parent | c1ab4ce3cb759f69fb9085a060e568b73e8f5cd8 (diff) | |
Merge branch 'x86/cpu' into x86/core, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/bugs.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/acpi/cppc.c')
| -rw-r--r-- | arch/x86/kernel/acpi/cppc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/cppc.c b/arch/x86/kernel/acpi/cppc.c index 77bfb846490c..62ca714aae77 100644 --- a/arch/x86/kernel/acpi/cppc.c +++ b/arch/x86/kernel/acpi/cppc.c @@ -272,7 +272,7 @@ int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator) } /* detect if running on heterogeneous design */ - if (cpu_feature_enabled(X86_FEATURE_AMD_HETEROGENEOUS_CORES)) { + if (cpu_feature_enabled(X86_FEATURE_AMD_HTR_CORES)) { switch (core_type) { case TOPO_CPU_TYPE_UNKNOWN: pr_warn("Undefined core type found for cpu %d\n", cpu); |