From 38ea3de3f117d8b553f85ad7251389e491ad2de3 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 16 Jun 2008 15:01:53 -0700
Subject: [PATCH] --- yaml --- r: 99571 b: refs/heads/master c:
 eb179e443deb0a5c81a62b4c157124a4b7ff1813 h: refs/heads/master i:   99569:
 ed24793cec4fa2fefbeecca991f6b800514b0750   99567:
 58adb7ac41a814d3674ed09c97321b0993cff9b0 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/enlighten.c | 5 +++++
 trunk/arch/x86/xen/mmu.c       | 4 +---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 09ac9593b802..2c67a249a31e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6673cf63e5d973db5145d1f48b354efcb9fe2a13
+refs/heads/master: eb179e443deb0a5c81a62b4c157124a4b7ff1813
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index 8e6152e6ed88..73fb0c4c150a 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1280,6 +1280,11 @@ asmlinkage void __init xen_start_kernel(void)
 	if (xen_feature(XENFEAT_supervisor_mode_kernel))
 		pv_info.kernel_rpl = 0;
 
+	/* Prevent unwanted bits from being set in PTEs. */
+	__supported_pte_mask &= ~_PAGE_GLOBAL;
+	if (!is_initial_xendomain())
+		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
+
 	/* set the limit of our address space */
 	xen_reserve_top();
 
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index 7c9935858f92..f0078d9a5b78 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -343,10 +343,8 @@ pgdval_t xen_pgd_val(pgd_t pgd)
 
 pte_t xen_make_pte(pteval_t pte)
 {
-	if (pte & _PAGE_PRESENT) {
+	if (pte & _PAGE_PRESENT)
 		pte = phys_to_machine(XPADDR(pte)).maddr;
-		pte &= ~(_PAGE_PCD | _PAGE_PWT);
-	}
 
 	return (pte_t){ .pte = pte };
 }