diff options
| author | Alexander Graf <agraf@suse.de> | 2014-05-12 01:11:55 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-05-30 14:26:25 +0200 |
| commit | 5c165aeca3e357fbc9760e5f66b6de8ef994e3c7 (patch) | |
| tree | 31b2577ffb498b1884a79ab78268d7fbb903b3d6 /arch | |
| parent | KVM: PPC: Disable NX for old magic page using guests (diff) | |
| download | linux-5c165aeca3e357fbc9760e5f66b6de8ef994e3c7.tar.xz linux-5c165aeca3e357fbc9760e5f66b6de8ef994e3c7.zip | |
PPC: KVM: Make NX bit available with magic page
Because old kernels enable the magic page and then choke on NXed trampoline
code we have to disable NX by default in KVM when we use the magic page.
However, since commit b18db0b8 we have successfully fixed that and can now
leave NX enabled, so tell the hypervisor about this.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c index 6a0175297b0d..5e6f24f894d9 100644 --- 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)); |