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-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
"Fix a recent cpufreq initialization regression (Rafael Wysocki),
revert a devfreq commit that made incompatible changes and broke user
land on some systems (Orson Zhai), drop a stale reference to a
document that has gone away recently (Jonathan Neuschäfer), and fix a
typo in a hibernation code comment (Alexandre Belloni)"

* tag 'pm-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: Fix policy initialization for internal governor drivers
Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"
PM / hibernate: fix typo "reserverd_size" -> "reserved_size"
Documentation: power: Drop reference to interface.rst

Linus Torvalds 36428598 bfeb4f99

+12 -7
-1
Documentation/power/index.rst
··· 13 13 drivers-testing 14 14 energy-model 15 15 freezing-of-tasks 16 - interface 17 16 opp 18 17 pci 19 18 pm_qos_interface
+10 -2
drivers/cpufreq/cpufreq.c
··· 1076 1076 pol = policy->last_policy; 1077 1077 } else if (def_gov) { 1078 1078 pol = cpufreq_parse_policy(def_gov->name); 1079 - } else { 1080 - return -ENODATA; 1079 + /* 1080 + * In case the default governor is neiter "performance" 1081 + * nor "powersave", fall back to the initial policy 1082 + * value set by the driver. 1083 + */ 1084 + if (pol == CPUFREQ_POLICY_UNKNOWN) 1085 + pol = policy->policy; 1081 1086 } 1087 + if (pol != CPUFREQ_POLICY_PERFORMANCE && 1088 + pol != CPUFREQ_POLICY_POWERSAVE) 1089 + return -ENODATA; 1082 1090 } 1083 1091 1084 1092 return cpufreq_set_policy(policy, gov, pol);
+1 -3
drivers/devfreq/devfreq.c
··· 738 738 { 739 739 struct devfreq *devfreq; 740 740 struct devfreq_governor *governor; 741 - static atomic_t devfreq_no = ATOMIC_INIT(-1); 742 741 int err = 0; 743 742 744 743 if (!dev || !profile || !governor_name) { ··· 799 800 devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); 800 801 atomic_set(&devfreq->suspend_count, 0); 801 802 802 - dev_set_name(&devfreq->dev, "devfreq%d", 803 - atomic_inc_return(&devfreq_no)); 803 + dev_set_name(&devfreq->dev, "%s", dev_name(dev)); 804 804 err = device_register(&devfreq->dev); 805 805 if (err) { 806 806 mutex_unlock(&devfreq->lock);
+1 -1
kernel/power/snapshot.c
··· 1681 1681 * hibernation for allocations made while saving the image and for device 1682 1682 * drivers, in case they need to allocate memory from their hibernation 1683 1683 * callbacks (these two numbers are given by PAGES_FOR_IO (which is a rough 1684 - * estimate) and reserverd_size divided by PAGE_SIZE (which is tunable through 1684 + * estimate) and reserved_size divided by PAGE_SIZE (which is tunable through 1685 1685 * /sys/power/reserved_size, respectively). To make this happen, we compute the 1686 1686 * total number of available page frames and allocate at least 1687 1687 *