summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/platsmp.c
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-05-08 16:07:56 +0000
committerJason Cooper <jason@lakedaemon.net>2014-05-08 16:07:56 +0000
commit5194efc5c649a7fa622eae9af7df5dbcec940ea4 (patch)
tree39cbc2056a3466748283f4a1570f1f8f3a445322 /arch/arm/mach-mvebu/platsmp.c
parent2c9b2240bee340711048589023eb057f23fda356 (diff)
parentbffbc6eabd0e48bba5415c4aec34cb75d459c73a (diff)
downloadlinux-stable-5194efc5c649a7fa622eae9af7df5dbcec940ea4.tar.gz
linux-stable-5194efc5c649a7fa622eae9af7df5dbcec940ea4.tar.bz2
linux-stable-5194efc5c649a7fa622eae9af7df5dbcec940ea4.zip
Merge branch 'mvebu/irqchip' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu/platsmp.c')
-rw-r--r--arch/arm/mach-mvebu/platsmp.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index e01ae51bee56..32bf78e80c48 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -70,11 +70,6 @@ static void __init set_secondary_cpus_clock(void)
}
}
-static void armada_xp_secondary_init(unsigned int cpu)
-{
- armada_xp_mpic_smp_cpu_init();
-}
-
static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
int ret, hw_cpu;
@@ -98,8 +93,6 @@ static void __init armada_xp_smp_init_cpus(void)
if (ncores == 0 || ncores > ARMADA_XP_MAX_CPUS)
panic("Invalid number of CPUs in DT\n");
-
- set_smp_cross_call(armada_mpic_send_doorbell);
}
static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
@@ -132,7 +125,6 @@ static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
struct smp_operations armada_xp_smp_ops __initdata = {
.smp_init_cpus = armada_xp_smp_init_cpus,
.smp_prepare_cpus = armada_xp_smp_prepare_cpus,
- .smp_secondary_init = armada_xp_secondary_init,
.smp_boot_secondary = armada_xp_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_die = armada_xp_cpu_die,