x86: Fix writable-pagetable cmpxchg path to properly adjust PTE (i.e.,

set _PAGE_GLOBAL for x86/64 guest user mappings).
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 46ed6b12263677df7548129f465a7aa352acbabb..d25fba76741bcc3260ec1261df3e655b409e60e2 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -3403,7 +3403,7 @@ static int ptwr_emulated_update(
         ol1e = l1e_from_intpte(old);
 
         okay = paging_cmpxchg_guest_entry(v, &l1e_get_intpte(*pl1e),
-                                          &t, val, _mfn(mfn));
+                                          &t, l1e_get_intpte(nl1e), _mfn(mfn));
         okay = (okay && t == old);
 
         if ( !okay )