diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-08-20 14:23:09 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-08-20 14:23:09 +0300 |
| commit | ca3385a507ad918fb8b7a6a52ad3d321601a66f2 (patch) | |
| tree | 1e33648cdbdedd9f3a315dcefb8d7435d5b8129f /include/linux | |
| parent | 78bc117095cc30408e2131e81757a6659ac4b002 (diff) | |
| parent | 6caa5812e2d126a0aa8a17816c1ba6f0a0c2b309 (diff) | |
| download | linux-ca3385a507ad918fb8b7a6a52ad3d321601a66f2.tar.xz | |
Merge branch kvm-arm64/generic-entry into kvmarm-master/next
Switch KVM/arm64 to the generic entry code, courtesy of Oliver Upton
* kvm-arm64/generic-entry:
KVM: arm64: Use generic KVM xfer to guest work function
entry: KVM: Allow use of generic KVM entry w/o full generic support
KVM: arm64: Record number of signal exits as a vCPU stat
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/entry-kvm.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/entry-kvm.h b/include/linux/entry-kvm.h index 136b8d97d8c0..0d7865a0731c 100644 --- a/include/linux/entry-kvm.h +++ b/include/linux/entry-kvm.h @@ -2,7 +2,11 @@ #ifndef __LINUX_ENTRYKVM_H #define __LINUX_ENTRYKVM_H -#include <linux/entry-common.h> +#include <linux/static_call_types.h> +#include <linux/tracehook.h> +#include <linux/syscalls.h> +#include <linux/seccomp.h> +#include <linux/sched.h> #include <linux/tick.h> /* Transfer to guest mode work */ |