diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-05-21 16:24:11 +0200 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-05-21 16:24:11 +0200 |
| commit | 05774088391c7430f6a4c1d5d18196ef17bb3ba9 (patch) | |
| tree | f8263dcb34690375f12de8b533c426138b53d5a0 /arch/arm/mach-virt/virt.c | |
| parent | Linux 3.10-rc2 (diff) | |
| download | linux-05774088391c7430f6a4c1d5d18196ef17bb3ba9.tar.xz linux-05774088391c7430f6a4c1d5d18196ef17bb3ba9.zip | |
arm: introduce psci_smp_ops
Rename virt_smp_ops to psci_smp_ops and move them to arch/arm/kernel/psci_smp.c.
Remove mach-virt/platsmp.c, now unused.
Compile psci_smp if CONFIG_ARM_PSCI and CONFIG_SMP.
Add a cpu_die smp_op based on psci_ops.cpu_off.
Initialize PSCI before setting smp_ops in setup_arch.
If PSCI is available on the platform, prefer psci_smp_ops over the
platform smp_ops.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Will Deacon <will.deacon@arm.com>
CC: arnd@arndb.de
CC: marc.zyngier@arm.com
CC: linux@arm.linux.org.uk
CC: nico@linaro.org
CC: rob.herring@calxeda.com
Diffstat (limited to 'arch/arm/mach-virt/virt.c')
| -rw-r--r-- | arch/arm/mach-virt/virt.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c index 061f283f579e..a67d2dd5bb60 100644 --- a/arch/arm/mach-virt/virt.c +++ b/arch/arm/mach-virt/virt.c @@ -36,11 +36,8 @@ static const char *virt_dt_match[] = { NULL }; -extern struct smp_operations virt_smp_ops; - DT_MACHINE_START(VIRT, "Dummy Virtual Machine") .init_irq = irqchip_init, .init_machine = virt_init, - .smp = smp_ops(virt_smp_ops), .dt_compat = virt_dt_match, MACHINE_END |