diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-16 14:31:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-16 14:31:03 +0200 |
| commit | acc53b49b183adaee6c839430a04b464908db84f (patch) | |
| tree | b7cd55555159a9e4ee57498e258c1692423d24d0 /drivers/firmware | |
| parent | c47b3bd0d3a18a93d62b91d2d02e3fe599805e6d (diff) | |
| parent | fd7c3c29f9abab50a84fd4fd6811129641c53b2f (diff) | |
| download | linux-stable-acc53b49b183adaee6c839430a04b464908db84f.tar.gz linux-stable-acc53b49b183adaee6c839430a04b464908db84f.tar.bz2 linux-stable-acc53b49b183adaee6c839430a04b464908db84f.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: Replace ktime_get() with local_clock()
drivers: firmware: psci: use const and __initconst for psci_cpuidle_ops
soc: qcom: spm: Use const and __initconst for qcom_cpuidle_ops
ARM: cpuidle: constify return value of arm_cpuidle_get_ops()
ARM: cpuidle: add const qualifier to cpuidle_ops member in structures
intel_idle: add BXT support
cpuidle: Indicate when a device has been unregistered
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index b5d05807e6ec..fa4ea22ca12e 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -355,7 +355,7 @@ int psci_cpu_suspend_enter(unsigned long index) /* ARM specific CPU idle operations */ #ifdef CONFIG_ARM -static struct cpuidle_ops psci_cpuidle_ops __initdata = { +static const struct cpuidle_ops psci_cpuidle_ops __initconst = { .suspend = psci_cpu_suspend_enter, .init = psci_dt_cpu_init_idle, }; |