diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-09-16 08:24:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-09-16 08:24:22 +0200 |
| commit | 85df1cd15ff5d775e88e23b9fc2a9f429fa5b504 (patch) | |
| tree | a9988524f4a9dd1e0a5403ba8a99939b9c71af30 /drivers/cpufreq/intel_pstate.c | |
| parent | 8d73829b78ca1a0e6eb93380f3bf5193d58c281c (diff) | |
| parent | 7f830e126dc357fc086905ce9730140fd4528d66 (diff) | |
Merge branch 'x86/urgent' into x86/apic, to resolve conflict
Conflicts:
arch/x86/include/asm/sev.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index f366d35c5840..0d5d283a5429 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1034,8 +1034,8 @@ static bool hybrid_register_perf_domain(unsigned int cpu) if (!cpu_dev) return false; - if (em_dev_register_perf_domain(cpu_dev, HYBRID_EM_STATE_COUNT, &cb, - cpumask_of(cpu), false)) + if (em_dev_register_pd_no_update(cpu_dev, HYBRID_EM_STATE_COUNT, &cb, + cpumask_of(cpu), false)) return false; cpudata->pd_registered = true; |