From: Christoph Egger <Christoph.Egger@amd.com>
Date: Thu, 26 Jul 2012 18:02:44 +0000 (+0100)
Subject: x86/mm/p2m: use NX bit for p2m entries
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8119
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ec3b989923b766e53bedb11cfd7553de3abc00b;p=xen.git

x86/mm/p2m: use NX bit for p2m entries

In addition to c/s 25614:7d8a2e8412f2 also use the NX bit
for non-ram types.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c
index 2a4a64d51c..6f07191e55 100644
--- a/xen/arch/x86/mm/p2m-pt.c
+++ b/xen/arch/x86/mm/p2m-pt.c
@@ -88,7 +88,7 @@ static unsigned long p2m_type_to_flags(p2m_type_t t, mfn_t mfn)
     case p2m_ram_paged:
     case p2m_ram_paging_in:
     default:
-        return flags;
+        return flags | _PAGE_NX_BIT;
     case p2m_grant_map_ro:
         return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT;
     case p2m_ram_ro: