diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-11 00:16:21 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-11 00:16:21 +0200 |
commit | 1633b396105b69efe8bfc83e33662276cc8a7675 (patch) | |
tree | c848cc284fc139e82f588238692e43f92fc54eea /kernel | |
parent | Merge tag 'for-f2fs-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ja... (diff) | |
parent | Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq' (diff) | |
download | linux-1633b396105b69efe8bfc83e33662276cc8a7675.tar.xz linux-1633b396105b69efe8bfc83e33662276cc8a7675.zip |
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"
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index d401c21136d1..42bd800a6755 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -705,7 +705,7 @@ static struct attribute * g[] = { NULL, }; -static struct attribute_group attr_group = { +static const struct attribute_group attr_group = { .attrs = g, }; |