From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 22 Nov 2007 14:22:05 +0000 (+0000)
Subject: linux/i386: Use normal set_pmd() in vmalloc_sync_one() on modern Xen
X-Git-Tag: xen-3.2.0~81
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b752a9dcfbbb20db72592c0581e3ca826ae72878;p=legacy%2Flinux-2.6.18-xen.git

linux/i386: Use normal set_pmd() in vmalloc_sync_one() on modern Xen
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/arch/i386/mm/fault-xen.c b/arch/i386/mm/fault-xen.c
index 97f5a5a5..bd052c91 100644
--- a/arch/i386/mm/fault-xen.c
+++ b/arch/i386/mm/fault-xen.c
@@ -382,11 +382,11 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
 	if (!pmd_present(*pmd_k))
 		return NULL;
 	if (!pmd_present(*pmd))
-#ifndef CONFIG_XEN
+#if CONFIG_XEN_COMPAT > 0x030002
 		set_pmd(pmd, *pmd_k);
 #else
 		/*
-		 * When running on Xen we must launder *pmd_k through
+		 * When running on older Xen we must launder *pmd_k through
 		 * pmd_val() to ensure that _PAGE_PRESENT is correctly set.
 		 */
 		set_pmd(pmd, __pmd(pmd_val(*pmd_k)));