diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:50:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-17 01:23:42 +0000 |
| commit | d1f7a4c0bfda09bebb1948e2169a6ce6a7319bd3 (patch) | |
| tree | 872faf5dcd234e04025a526e83e867a7855cb9b7 /arch/arm/include | |
| parent | c293f79246d7cdaf6e75b40aa1f957eb8d195835 (diff) | |
| parent | c0131386abdafa081356c1c02129df6413e685e0 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
arch/arm/include/asm/psci.h
arch/arm/kernel/psci.c
arch/arm/kernel/psci_smp.c
arch/arm/kernel/setup.c
arch/arm64/Kconfig
arch/arm64/include/asm/cpu_ops.h
arch/arm64/include/asm/pgtable.h
arch/arm64/include/asm/psci.h
arch/arm64/kernel/head.S
arch/arm64/kernel/psci.c
arch/arm64/kernel/ptrace.c
Diffstat (limited to 'arch/arm/include')
| -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 f0a8627c9f1c..b1946b7bbe94 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -33,16 +33,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 |