diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-05-21 10:24:11 -0400 |
---|---|---|
committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-05-21 10:24:11 -0400 |
commit | 05774088391c7430f6a4c1d5d18196ef17bb3ba9 (patch) | |
tree | f8263dcb34690375f12de8b533c426138b53d5a0 /arch/arm/include/asm/psci.h | |
parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) |
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/include/asm/psci.h')
-rw-r--r-- | arch/arm/include/asm/psci.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index ce0dbe7c1625..c4ae171850f8 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h | |||
@@ -32,5 +32,14 @@ struct psci_operations { | |||
32 | }; | 32 | }; |
33 | 33 | ||
34 | extern struct psci_operations psci_ops; | 34 | extern struct psci_operations psci_ops; |
35 | extern struct smp_operations psci_smp_ops; | ||
36 | |||
37 | #ifdef CONFIG_ARM_PSCI | ||
38 | void psci_init(void); | ||
39 | bool psci_smp_available(void); | ||
40 | #else | ||
41 | static inline void psci_init(void) { } | ||
42 | static inline bool psci_smp_available(void) { return false; } | ||
43 | #endif | ||
35 | 44 | ||
36 | #endif /* __ASM_ARM_PSCI_H */ | 45 | #endif /* __ASM_ARM_PSCI_H */ |