projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
[linux-2.6-microblaze.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
8467e05
..
343fc9e
100644
(file)
--- a/
arch/arm/include/asm/kvm_host.h
+++ b/
arch/arm/include/asm/kvm_host.h
@@
-78,6
+78,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