# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID ad2cb0bb663182d95417960b1db4af06eba6a436
# Parent  3e639ddee3e087ffc2e2b162e0ed4b75e2dd8508
Xen/IA64 changes memory attributes of tlb into WB to prevent domU from
uncachable access.
But NaTPage attribute need not to be changed to WB.
Linux uses NaTPage attributes.
PATCHNAME: dont_change_natpage_into_wb

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 3e639ddee3e0 -r ad2cb0bb6631 xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c	Fri Jul 07 18:32:58 2006 +0900
+++ b/xen/arch/ia64/xen/mm.c	Fri Jul 07 18:33:00 2006 +0900
@@ -475,8 +475,11 @@ u64 translate_domain_pte(u64 pteval, u64
 	 * Don't let non-dom0 domains map uncached addresses.  This can
 	 * happen when domU tries to touch i/o port space.  Also prevents
 	 * possible address aliasing issues.
+	 * WB => WB
+	 * UC, UCE, WC => WB
+	 * NaTPage => NaTPage
 	 */
-	if (d != dom0)
+	if (d != dom0 && (pteval2 & _PAGE_MA_MASK) != _PAGE_MA_NAT)
 		pteval2 &= ~_PAGE_MA_MASK;
 
 	return pteval2;