diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-27 11:57:31 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-27 11:57:31 +0100 |
| commit | 65dea11925b9e2af4f5bfec460b89a5dba548207 (patch) | |
| tree | e18da2d092199c471d0fbcaed999c3f9abf0ca99 /include | |
| parent | 6a28fb8cb28b9eb39a392e531d938a889eacafc5 (diff) | |
| parent | 16fb8d8a0e050e8f151da7dd2e03ccc500dfd8da (diff) | |
Merge back earlier cpufreq material for 7.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/cppc_acpi.h | 1 | ||||
| -rw-r--r-- | include/linux/cpufreq.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h index 4d644f03098e..e6c5ef3173c5 100644 --- a/include/acpi/cppc_acpi.h +++ b/include/acpi/cppc_acpi.h @@ -156,6 +156,7 @@ extern int cppc_set_enable(int cpu, bool enable); extern int cppc_get_perf_caps(int cpu, struct cppc_perf_caps *caps); extern bool cppc_perf_ctrs_in_pcc_cpu(unsigned int cpu); extern bool cppc_perf_ctrs_in_pcc(void); +extern u64 cppc_get_dmi_max_khz(void); extern unsigned int cppc_perf_to_khz(struct cppc_perf_caps *caps, unsigned int perf); extern unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int freq); extern bool acpi_cpc_valid(void); diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index cc894fc38971..8ca2bcb3d7ae 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -232,7 +232,7 @@ static inline bool policy_is_inactive(struct cpufreq_policy *policy) static inline bool policy_is_shared(struct cpufreq_policy *policy) { - return cpumask_weight(policy->cpus) > 1; + return cpumask_nth(1, policy->cpus) < nr_cpumask_bits; } #ifdef CONFIG_CPU_FREQ |