projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof...
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
kvm.c
diff --git
a/arch/powerpc/kernel/kvm.c
b/arch/powerpc/kernel/kvm.c
index
dd8695f
..
33aa4dd
100644
(file)
--- a/
arch/powerpc/kernel/kvm.c
+++ b/
arch/powerpc/kernel/kvm.c
@@
-417,7
+417,7
@@
static void kvm_map_magic_page(void *data)
ulong out[8];
in[0] = KVM_MAGIC_PAGE;
- in[1] = KVM_MAGIC_PAGE;
+ in[1] = KVM_MAGIC_PAGE
| MAGIC_PAGE_FLAG_NOT_MAPPED_NX
;
epapr_hypercall(in, out, KVM_HCALL_TOKEN(KVM_HC_PPC_MAP_MAGIC_PAGE));