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 tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[linux-2.6-microblaze.git]
/
arch
/
arm
/
kvm
/
arm.c
diff --git
a/arch/arm/kvm/arm.c
b/arch/arm/kvm/arm.c
index
8966e59
..
8a31906
100644
(file)
--- a/
arch/arm/kvm/arm.c
+++ b/
arch/arm/kvm/arm.c
@@
-1140,6
+1140,9
@@
static void cpu_hyp_reinit(void)
} else {
cpu_init_hyp_mode(NULL);
}
+
+ if (vgic_present)
+ kvm_vgic_init_cpu_hardware();
}
static void _kvm_arch_hardware_enable(void *discard)