projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic...
[cascardo/linux.git]
/
arch
/
arm
/
kvm
/
arm.c
diff --git
a/arch/arm/kvm/arm.c
b/arch/arm/kvm/arm.c
index
1d8248e
..
bd18bb8
100644
(file)
--- a/
arch/arm/kvm/arm.c
+++ b/
arch/arm/kvm/arm.c
@@
-878,7
+878,8
@@
static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
unsigned long cmd,
void *v)
{
- if (cmd == CPU_PM_EXIT) {
+ if (cmd == CPU_PM_EXIT &&
+ __hyp_get_vectors() == hyp_default_vectors) {
cpu_init_hyp_mode(NULL);
return NOTIFY_OK;
}