diff options
| author | Olof Johansson <olof@lixom.net> | 2016-01-12 10:14:07 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-01-12 10:14:07 -0800 |
| commit | 3e9121950c92a65e33e0163d2ba111b4d9293d4c (patch) | |
| tree | 478a948e76d8f660b0f3b898c1094df5b172e433 /arch/arm/kernel/psci_smp.c | |
| parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
| parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) | |
Merge branch 'treewide/cleanup' into late/tegra
* treewide/cleanup:
ARM: use "depends on" for SoC configs instead of "if" after prompt
ARM/clocksource: use automatic DT probing for ux500 PRCMU
ARM: use const and __initconst for smp_operations
ARM: hisi: do not export smp_operations structures
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/kernel/psci_smp.c')
| -rw-r--r-- | arch/arm/kernel/psci_smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c index 9d479b2ea40d..cb3fcaeb2233 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -120,7 +120,7 @@ bool __init psci_smp_available(void) return (psci_ops.cpu_on != NULL); } -struct smp_operations __initdata psci_smp_ops = { +const struct smp_operations psci_smp_ops __initconst = { .smp_boot_secondary = psci_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU .cpu_disable = psci_cpu_disable, |