diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2015-06-05 11:21:23 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-06-05 11:21:23 +0100 |
| commit | addc8120a784181cc6410973948eee94ea16f2bd (patch) | |
| tree | de84cba276c224bcc4c1070a58a4f19625960723 /arch/arm | |
| parent | eb7c11ee3c5ce6c45ac28a5015a8e60ed458b412 (diff) | |
| parent | c5a1330573c1748179898f4799f130e416ce4738 (diff) | |
Merge branch 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux
* 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux:
arm64: psci: remove ACPI coupling
arm64: psci: kill psci_power_state
arm64: psci: account for Trusted OS instances
arm64: psci: support unsigned return values
arm64: psci: remove unnecessary id indirection
arm64: smp: consistently use error codes
arm64: smp_plat: add get_logical_index
arm/arm64: kvm: add missing PSCI include
Conflicts:
arch/arm64/kernel/smp.c
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kvm/psci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c index 02fa8eff6ae1..7e9398c6b387 100644 --- a/arch/arm/kvm/psci.c +++ b/arch/arm/kvm/psci.c @@ -24,6 +24,8 @@ #include <asm/kvm_psci.h> #include <asm/kvm_host.h> +#include <uapi/linux/psci.h> + /* * This is an implementation of the Power State Coordination Interface * as described in ARM document number ARM DEN 0022A. |