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

Pull more power management updates from Rafael Wysocki:
"These revert one recent change in the generic power domains
framework, fix a recently introduced build issue in there and
constify attribute_group structures in some places.

Specifics:

- Revert a recent change in the generic power domains (genpd)
framework that led to regressions and turned out the be misguided
(Rafael Wysocki).

- Fix a recently introduced build issue in the generic power domains
(genpd) framework (Arnd Bergmann).

- Constify attribute_group structures in the PM core, the cpufreq
stats code and in intel_pstate (Arvind Yadav)"

* tag 'pm-extra-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: intel_pstate: constify attribute_group structures
cpufreq: cpufreq_stats: constify attribute_group structures
PM / sleep: constify attribute_group structures
PM / Domains: provide pm_genpd_poweroff_noirq() stub
Revert "PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device"

Linus Torvalds 1633b396 5cdd4c04

+6 -5
+3 -2
drivers/base/power/domain.c
··· 1148 1148 { 1149 1149 struct generic_pm_domain *genpd; 1150 1150 1151 - genpd = genpd_lookup_dev(dev); 1152 - if (!genpd) 1151 + genpd = dev_to_genpd(dev); 1152 + if (!pm_genpd_present(genpd)) 1153 1153 return; 1154 1154 1155 1155 if (suspend) { ··· 1180 1180 #define pm_genpd_resume_noirq NULL 1181 1181 #define pm_genpd_freeze_noirq NULL 1182 1182 #define pm_genpd_thaw_noirq NULL 1183 + #define pm_genpd_poweroff_noirq NULL 1183 1184 #define pm_genpd_restore_noirq NULL 1184 1185 #define pm_genpd_complete NULL 1185 1186
+1 -1
drivers/cpufreq/cpufreq_stats.c
··· 135 135 &trans_table.attr, 136 136 NULL 137 137 }; 138 - static struct attribute_group stats_attr_group = { 138 + static const struct attribute_group stats_attr_group = { 139 139 .attrs = default_attrs, 140 140 .name = "stats" 141 141 };
+1 -1
drivers/cpufreq/intel_pstate.c
··· 1214 1214 NULL 1215 1215 }; 1216 1216 1217 - static struct attribute_group intel_pstate_attr_group = { 1217 + static const struct attribute_group intel_pstate_attr_group = { 1218 1218 .attrs = intel_pstate_attributes, 1219 1219 }; 1220 1220
+1 -1
kernel/power/main.c
··· 705 705 NULL, 706 706 }; 707 707 708 - static struct attribute_group attr_group = { 708 + static const struct attribute_group attr_group = { 709 709 .attrs = g, 710 710 }; 711 711