diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-22 10:52:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-22 10:53:20 +0100 |
| commit | 78ecad0183bd7e49131da2b5aa82bee017db1cf0 (patch) | |
| tree | 4059732146dd410d134fbc9eddfbb3f79ef509a5 /arch/arm/include/asm/psci.h | |
| parent | f150abe1012f2fc7d444d33d651db32435038c11 (diff) | |
| parent | b382b940f821784107ca22de3455bb90e4512557 (diff) | |
| download | linux-78ecad0183bd7e49131da2b5aa82bee017db1cf0.tar.gz linux-78ecad0183bd7e49131da2b5aa82bee017db1cf0.tar.bz2 linux-78ecad0183bd7e49131da2b5aa82bee017db1cf0.zip | |
Merge tag '3.10-rc2-psci-ops-11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen into devel-stable
Pull psci_smp_ops support from Stefano Stabellini:
It contains the generic PSCI patch and the smp_init patch that we
discussed so much about. I think it would be helpful for other
people if you could create a stable branch with these patches so
that SoC devs can base their work on it.
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 { }; extern struct psci_operations psci_ops; +extern struct smp_operations psci_smp_ops; + +#ifdef CONFIG_ARM_PSCI +void psci_init(void); +bool psci_smp_available(void); +#else +static inline void psci_init(void) { } +static inline bool psci_smp_available(void) { return false; } +#endif #endif /* __ASM_ARM_PSCI_H */ |