diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 17:07:52 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 17:07:52 +0100 |
| commit | 11c7a6c5a3232e2ff1127d80d609daa95df5d5d4 (patch) | |
| tree | 52a7bfe7994eb7f0c9d4b9301ad3c27f9bb9ad71 /arch/arm/mach-realview | |
| parent | ARM: realview: build realview-dt SMP support only when used (diff) | |
| parent | ARM: use "depends on" for SoC configs instead of "if" after prompt (diff) | |
| download | linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.tar.xz linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.zip | |
Merge branch 'treewide/cleanup' into next/multiplatform
The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.
* 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
Conflicts:
arch/arm/mach-integrator/Kconfig
Diffstat (limited to 'arch/arm/mach-realview')
| -rw-r--r-- | arch/arm/mach-realview/core.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-realview/platsmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h index e1640b2f4350..05a995ea16d3 100644 --- a/arch/arm/mach-realview/core.h +++ b/arch/arm/mach-realview/core.h @@ -52,7 +52,7 @@ extern int realview_usb_register(struct resource *res); extern void realview_init_early(void); extern void realview_fixup(struct tag *tags, char **from); -extern struct smp_operations realview_smp_ops; +extern const struct smp_operations realview_smp_ops; extern void realview_cpu_die(unsigned int cpu); #endif diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index a2331b36ccce..e8ab69c7abfb 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c @@ -75,7 +75,7 @@ static void __init realview_smp_prepare_cpus(unsigned int max_cpus) __io_address(REALVIEW_SYS_FLAGSSET)); } -struct smp_operations realview_smp_ops __initdata = { +const struct smp_operations realview_smp_ops __initconst = { .smp_init_cpus = realview_smp_init_cpus, .smp_prepare_cpus = realview_smp_prepare_cpus, .smp_secondary_init = versatile_secondary_init, |