summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-12-23 00:10:00 +0300
committerOlof Johansson <olof@lixom.net>2015-12-23 00:10:00 +0300
commit8907dbaa363de87e5c6f48070e3d8b639477d5ba (patch)
tree8c3e0245a7bd10535e5fab6d2da99de6824f5851 /arch/arm/mach-uniphier
parent9cdac4a20a963d946f3ce13e6dd4943a780f5b54 (diff)
parente324654294907a420ab3773efe8849a935f37bf0 (diff)
downloadlinux-8907dbaa363de87e5c6f48070e3d8b639477d5ba.tar.xz
Merge branch 'treewide/cleanup' into next/soc
Merge in cleanup to avoid internal conflicts with newly added code. * 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/mach-uniphier')
-rw-r--r--arch/arm/mach-uniphier/platsmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c
index f0577664611c..e1cfc1d6e2f4 100644
--- a/arch/arm/mach-uniphier/platsmp.c
+++ b/arch/arm/mach-uniphier/platsmp.c
@@ -201,7 +201,7 @@ static int __init uniphier_smp_boot_secondary(unsigned int cpu,
return 0;
}
-static struct smp_operations uniphier_smp_ops __initdata = {
+static const struct smp_operations uniphier_smp_ops __initconst = {
.smp_prepare_cpus = uniphier_smp_prepare_cpus,
.smp_boot_secondary = uniphier_smp_boot_secondary,
};