tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
"These fix hibernation (after recent changes), frequency QoS and the
sparc cpufreq driver.

Specifics:

- Unbreak the /sys/power/resume interface after recent changes (Azat
Khuzhin).

- Allow PM_QOS_DEFAULT_VALUE to be used with frequency QoS (Chungkai
Yang).

- Remove __init from cpufreq callbacks in the sparc driver, because
they may be called after initialization too (Viresh Kumar)"

* tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: sparc: Don't mark cpufreq callbacks with __init
PM: QoS: Restore support for default value on frequency QoS
PM: hibernate: Fix writing maj:min to /sys/power/resume

Linus Torvalds bde7f150 3a97a299

+10 -4
+1 -1
drivers/cpufreq/sparc-us2e-cpufreq.c
··· 269 269 return smp_call_function_single(cpu, __us2e_freq_target, &index, 1); 270 270 } 271 271 272 - static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy) 272 + static int us2e_freq_cpu_init(struct cpufreq_policy *policy) 273 273 { 274 274 unsigned int cpu = policy->cpu; 275 275 unsigned long clock_tick = sparc64_get_clock_tick(cpu) / 1000;
+1 -1
drivers/cpufreq/sparc-us3-cpufreq.c
··· 117 117 return smp_call_function_single(cpu, update_safari_cfg, &new_bits, 1); 118 118 } 119 119 120 - static int __init us3_freq_cpu_init(struct cpufreq_policy *policy) 120 + static int us3_freq_cpu_init(struct cpufreq_policy *policy) 121 121 { 122 122 unsigned int cpu = policy->cpu; 123 123 unsigned long clock_tick = sparc64_get_clock_tick(cpu) / 1000;
+1
kernel/power/hibernate.c
··· 1179 1179 unsigned maj, min, offset; 1180 1180 char *p, dummy; 1181 1181 1182 + error = 0; 1182 1183 if (sscanf(name, "%u:%u%c", &maj, &min, &dummy) == 2 || 1183 1184 sscanf(name, "%u:%u:%u:%c", &maj, &min, &offset, 1184 1185 &dummy) == 3) {
+7 -2
kernel/power/qos.c
··· 426 426 427 427 /* Definitions related to the frequency QoS below. */ 428 428 429 + static inline bool freq_qos_value_invalid(s32 value) 430 + { 431 + return value < 0 && value != PM_QOS_DEFAULT_VALUE; 432 + } 433 + 429 434 /** 430 435 * freq_constraints_init - Initialize frequency QoS constraints. 431 436 * @qos: Frequency QoS constraints to initialize. ··· 536 531 { 537 532 int ret; 538 533 539 - if (IS_ERR_OR_NULL(qos) || !req || value < 0) 534 + if (IS_ERR_OR_NULL(qos) || !req || freq_qos_value_invalid(value)) 540 535 return -EINVAL; 541 536 542 537 if (WARN(freq_qos_request_active(req), ··· 568 563 */ 569 564 int freq_qos_update_request(struct freq_qos_request *req, s32 new_value) 570 565 { 571 - if (!req || new_value < 0) 566 + if (!req || freq_qos_value_invalid(new_value)) 572 567 return -EINVAL; 573 568 574 569 if (WARN(!freq_qos_request_active(req),