diff options
| author | Rafael J. Wysocki <[email protected]> | 2016-05-06 20:08:46 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2016-05-06 20:08:46 +0000 |
| commit | fd7c3c29f9abab50a84fd4fd6811129641c53b2f (patch) | |
| tree | 907eb7ac29bdd4ab44f0e09bda8d54517cb4ebdb /drivers/firmware/psci.c | |
| parent | ARM: cpuidle: Pass on arm_cpuidle_suspend()'s return value (diff) | |
| parent | cpuidle: Replace ktime_get() with local_clock() (diff) | |
| download | kernel-fd7c3c29f9abab50a84fd4fd6811129641c53b2f.tar.gz kernel-fd7c3c29f9abab50a84fd4fd6811129641c53b2f.zip | |
Merge back new cpuidle material for v4.7.
Diffstat (limited to 'drivers/firmware/psci.c')
| -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 11bfee8b79a9..eb8134a148c0 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, }; |