Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix

[karo-tx-linux.git] / arch / arm / mach-berlin / platsmp.c

diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
index 405cd37e4fba59d1010b14e1e1e11db069ef75b8..93f90688db18301b081d045a1089fe14e63ac2c1 100644 (file)
--- a/arch/arm/mach-berlin/platsmp.c
+++ b/arch/arm/mach-berlin/platsmp.c
@@ -119,7 +119,7 @@ static int berlin_cpu_kill(unsigned int cpu)
 }
 #endif
 
-static struct smp_operations berlin_smp_ops __initdata = {
+static const struct smp_operations berlin_smp_ops __initconst = {
        .smp_prepare_cpus       = berlin_smp_prepare_cpus,
        .smp_boot_secondary     = berlin_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU