aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/xen/enlighten.c5
-rw-r--r--arch/x86/xen/mmu.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index c8a56e457d61..c048de34d6a1 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1228,6 +1228,11 @@ asmlinkage void __init xen_start_kernel(void)
1228 if (xen_feature(XENFEAT_supervisor_mode_kernel)) 1228 if (xen_feature(XENFEAT_supervisor_mode_kernel))
1229 pv_info.kernel_rpl = 0; 1229 pv_info.kernel_rpl = 0;
1230 1230
1231 /* Prevent unwanted bits from being set in PTEs. */
1232 __supported_pte_mask &= ~_PAGE_GLOBAL;
1233 if (!is_initial_xendomain())
1234 __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
1235
1231 /* set the limit of our address space */ 1236 /* set the limit of our address space */
1232 xen_reserve_top(); 1237 xen_reserve_top();
1233 1238
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 3525ef523a74..3f2a67fe6ad6 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -199,10 +199,8 @@ pgdval_t xen_pgd_val(pgd_t pgd)
199 199
200pte_t xen_make_pte(pteval_t pte) 200pte_t xen_make_pte(pteval_t pte)
201{ 201{
202 if (pte & _PAGE_PRESENT) { 202 if (pte & _PAGE_PRESENT)
203 pte = phys_to_machine(XPADDR(pte)).maddr; 203 pte = phys_to_machine(XPADDR(pte)).maddr;
204 pte &= ~(_PAGE_PCD | _PAGE_PWT);
205 }
206 204
207 return (pte_t){ .pte = pte }; 205 return (pte_t){ .pte = pte };
208} 206}