Hi Heiko,
Today's linux-next merge of the rockchip tree got a conflict in
arch/arm/mach-rockchip/platsmp.c between commit 75305275a721d33ae9abf ("ARM:
use const and __initconst for smp_operations") from the arm-soc tree and commit
9def7ccfe8d5b84 ("ARM: rockchip: add support smp for rk3036") from the rockchip
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/arm/mach-rockchip/platsmp.c
index 938888fc55a1,5c138f9699f9..000000000000
--- a/arch/arm/mach-rockchip/platsmp.c
+++ b/arch/arm/mach-rockchip/platsmp.c
@@@ -340,7 -351,16 +351,16 @@@ static void rockchip_cpu_die(unsigned i
}
#endif
-static struct smp_operations rk3036_smp_ops __initdata = {
++static const struct smp_operations rk3036_smp_ops __initdata = {
+ .smp_prepare_cpus = rk3036_smp_prepare_cpus,
+ .smp_boot_secondary = rockchip_boot_secondary,
+ #ifdef CONFIG_HOTPLUG_CPU
+ .cpu_kill = rockchip_cpu_kill,
+ .cpu_die = rockchip_cpu_die,
+ #endif
+ };
+
-static struct smp_operations rockchip_smp_ops __initdata = {
+static const struct smp_operations rockchip_smp_ops __initconst = {
.smp_prepare_cpus = rockchip_smp_prepare_cpus,
.smp_boot_secondary = rockchip_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
Attachment:
pgpRq1xxdVsXY.pgp
Description: PGP signature
