diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-05-08 16:07:56 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-05-08 16:07:56 +0000 |
| commit | 5194efc5c649a7fa622eae9af7df5dbcec940ea4 (patch) | |
| tree | 39cbc2056a3466748283f4a1570f1f8f3a445322 /arch | |
| parent | 2c9b2240bee340711048589023eb057f23fda356 (diff) | |
| parent | bffbc6eabd0e48bba5415c4aec34cb75d459c73a (diff) | |
| download | linux-5194efc5c649a7fa622eae9af7df5dbcec940ea4.tar.gz linux-5194efc5c649a7fa622eae9af7df5dbcec940ea4.tar.xz | |
Merge branch 'mvebu/irqchip' into mvebu/soc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/platsmp.c | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.h b/arch/arm/mach-mvebu/armada-370-xp.h index 237c86b83390..c3465f5b1250 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.h +++ b/arch/arm/mach-mvebu/armada-370-xp.h @@ -20,8 +20,6 @@ #define ARMADA_XP_MAX_CPUS 4 -void armada_mpic_send_doorbell(const struct cpumask *mask, unsigned int irq); -void armada_xp_mpic_smp_cpu_init(void); void armada_xp_secondary_startup(void); extern struct smp_operations armada_xp_smp_ops; #endif 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, |