diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 21:10:00 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 21:10:00 (GMT) |
| commit | 8907dbaa363de87e5c6f48070e3d8b639477d5ba (patch) | |
| tree | 8c3e0245a7bd10535e5fab6d2da99de6824f5851 /arch/arm/mach-alpine | |
| parent | 9cdac4a20a963d946f3ce13e6dd4943a780f5b54 (diff) | |
| parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) | |
| download | linux-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-alpine')
| -rw-r--r-- | arch/arm/mach-alpine/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-alpine/platsmp.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-alpine/Kconfig b/arch/arm/mach-alpine/Kconfig index 2c44b93..5c2d54f 100644 --- a/arch/arm/mach-alpine/Kconfig +++ b/arch/arm/mach-alpine/Kconfig @@ -1,5 +1,6 @@ config ARCH_ALPINE - bool "Annapurna Labs Alpine platform" if ARCH_MULTI_V7 + bool "Annapurna Labs Alpine platform" + depends on ARCH_MULTI_V7 select ARM_AMBA select ARM_GIC select GENERIC_IRQ_CHIP diff --git a/arch/arm/mach-alpine/platsmp.c b/arch/arm/mach-alpine/platsmp.c index f78429f..dd77ea2 100644 --- a/arch/arm/mach-alpine/platsmp.c +++ b/arch/arm/mach-alpine/platsmp.c @@ -42,7 +42,7 @@ static void __init alpine_smp_prepare_cpus(unsigned int max_cpus) alpine_cpu_pm_init(); } -static struct smp_operations alpine_smp_ops __initdata = { +static const struct smp_operations alpine_smp_ops __initconst = { .smp_prepare_cpus = alpine_smp_prepare_cpus, .smp_boot_secondary = alpine_boot_secondary, }; |