git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-for-davem-2018-05-09' of git://git.kernel.org/pub/scm/linux/kerne...
[sfrench/cifs-2.6.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 c6a749568dd6c413603ef3b7554561f356b33cc9..c7c28c885a1946de9a012311cbca7861d93a67da 100644
(file)
--- a/
arch/arm/include/asm/kvm_host.h
+++ b/
arch/arm/include/asm/kvm_host.h
@@
-77,6
+77,9
@@
struct kvm_arch {
/* Interrupt controller */
struct vgic_dist vgic;
int max_vcpus;
+
+ /* Mandated version of PSCI */
+ u32 psci_version;
};
#define KVM_NR_MEM_OBJS 40