diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-27 15:58:14 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-27 15:58:14 +0200 |
| commit | 04092204bb66c4f8e17465eeee64357dd2ad2585 (patch) | |
| tree | 16e62ff55ac394af5d2e6adb4950533578a20ce1 /arch/arm/include/asm/psci.h | |
| parent | 9b88ae99d2fe11e359b3b3992aff953e28b0b43a (diff) | |
| parent | 1252b3313642c3d0dff5b951b625468bf0dcd059 (diff) | |
Merge tag 'kvm-arm-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
Changed for the 3.16 merge window.
This includes KVM support for PSCI v0.2 and also includes generic Linux
support for PSCI v0.2 (on hosts that advertise that feature via their
DT), since the latter depends on headers introduced by the former.
Finally there's a small patch from Marc that enables Cortex-A53 support.
Diffstat (limited to 'arch/arm/include/asm/psci.h')
| -rw-r--r-- | arch/arm/include/asm/psci.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index c4ae171850f..b93e34a9fdf 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -29,16 +29,19 @@ struct psci_operations { int (*cpu_off)(struct psci_power_state state); int (*cpu_on)(unsigned long cpuid, unsigned long entry_point); int (*migrate)(unsigned long cpuid); + int (*affinity_info)(unsigned long target_affinity, + unsigned long lowest_affinity_level); + int (*migrate_info_type)(void); }; extern struct psci_operations psci_ops; extern struct smp_operations psci_smp_ops; #ifdef CONFIG_ARM_PSCI -void psci_init(void); +int psci_init(void); bool psci_smp_available(void); #else -static inline void psci_init(void) { } +static inline int psci_init(void) { } static inline bool psci_smp_available(void) { return false; } #endif |