summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-08 18:59:19 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-08 18:59:19 +0200
commit797b3a9ee790e8de2a34d427de96a1bb560fe0db (patch)
treedcc58ac1a966294b010521def7296d428f858583 /arch/arm/mach-zynq
parentc985d7e325fd5c2bf78de2f705f6001bce143a26 (diff)
parentbc895b5987dd5fad89c0e9693b38104679b647c4 (diff)
downloadtalos-obmc-linux-797b3a9ee790e8de2a34d427de96a1bb560fe0db.tar.gz
talos-obmc-linux-797b3a9ee790e8de2a34d427de96a1bb560fe0db.zip
Merge branch 'gic/cleanup' into next/soc2
Both zynq and shmobile have conflicts against the gic cleanup series, resolved here. Conflicts: arch/arm/mach-shmobile/smp-emev2.c arch/arm/mach-shmobile/smp-r8a7779.c arch/arm/mach-shmobile/smp-sh73a0.c arch/arm/mach-zynq/platsmp.c drivers/gpio/gpio-pl061.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r--arch/arm/mach-zynq/platsmp.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index 3072cbd7ec6f..5fc167e07619 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -34,21 +34,6 @@
*/
static int ncores;
-/* Secondary CPU kernel startup is a 2 step process. The primary CPU
- * starts the secondary CPU by giving it the address of the kernel and
- * then sending it an event to wake it up. The secondary CPU then
- * starts the kernel and tells the primary CPU it's up and running.
- */
-static void __cpuinit zynq_secondary_init(unsigned int cpu)
-{
- /*
- * if any interrupts are already enabled for the primary
- * core (e.g. timer irq), then they will not have been enabled
- * for us: do so
- */
- gic_secondary_init(0);
-}
-
int __cpuinit zynq_cpun_start(u32 address, int cpu)
{
u32 trampoline_code_size = &zynq_secondary_trampoline_end -
@@ -144,7 +129,6 @@ static void __init zynq_smp_prepare_cpus(unsigned int max_cpus)
struct smp_operations zynq_smp_ops __initdata = {
.smp_init_cpus = zynq_smp_init_cpus,
.smp_prepare_cpus = zynq_smp_prepare_cpus,
- .smp_secondary_init = zynq_secondary_init,
.smp_boot_secondary = zynq_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_die = zynq_platform_cpu_die,
OpenPOWER on IntegriCloud