projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
include
/
asm
/
kvm_host.h
diff --git
a/arch/arm/include/asm/kvm_host.h
b/arch/arm/include/asm/kvm_host.h
index
de338d9
..
2d19e02
100644
(file)
--- a/
arch/arm/include/asm/kvm_host.h
+++ b/
arch/arm/include/asm/kvm_host.h
@@
-39,7
+39,12
@@
#include <kvm/arm_vgic.h>
#include <kvm/arm_vgic.h>
+
+#ifdef CONFIG_ARM_GIC_V3
+#define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS
+#else
#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS
#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS
+#endif
#define KVM_REQ_VCPU_EXIT 8
#define KVM_REQ_VCPU_EXIT 8
@@
-183,15
+188,15
@@
struct kvm_vcpu_arch {
};
struct kvm_vm_stat {
};
struct kvm_vm_stat {
- u
32
remote_tlb_flush;
+ u
long
remote_tlb_flush;
};
struct kvm_vcpu_stat {
};
struct kvm_vcpu_stat {
- u
32
halt_successful_poll;
- u
32
halt_attempted_poll;
- u
32
halt_poll_invalid;
- u
32
halt_wakeup;
- u
32
hvc_exit_stat;
+ u
64
halt_successful_poll;
+ u
64
halt_attempted_poll;
+ u
64
halt_poll_invalid;
+ u
64
halt_wakeup;
+ u
64
hvc_exit_stat;
u64 wfe_exit_stat;
u64 wfi_exit_stat;
u64 mmio_exit_user;
u64 wfe_exit_stat;
u64 wfi_exit_stat;
u64 mmio_exit_user;