[Xen-changelog] Clean up use of get_pfn_from_mfn().

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID cd6a8d73f5292d4063dee4005c70015f07c7a663
# Parent  944cf29d126d9cdd84f033da9c0f8b1c843b1361
Clean up use of get_pfn_from_mfn().

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 944cf29d126d -r cd6a8d73f529 xen/arch/x86/x86_32/mm.c
--- a/xen/arch/x86/x86_32/mm.c  Wed Nov 23 12:50:14 2005
+++ b/xen/arch/x86/x86_32/mm.c  Wed Nov 23 12:54:40 2005
@@ -107,7 +107,8 @@
             l2e_from_page(pg, (__PAGE_HYPERVISOR | _PAGE_PSE) & ~_PAGE_RW);
     }
 
-    for ( i = 0; i < max_page; i++)
+    /* Fill with an obvious debug pattern. */
+    for ( i = 0; i < (mpt_size / BYTES_PER_LONG); i++)
         set_pfn_from_mfn(i, 0x55555555);
 
     /* Create page tables for ioremap(). */
diff -r 944cf29d126d -r cd6a8d73f529 xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c       Wed Nov 23 12:50:14 2005
+++ b/xen/arch/x86/x86_32/traps.c       Wed Nov 23 12:54:40 2005
@@ -93,7 +93,7 @@
 #ifdef CONFIG_X86_PAE
     ptab = map_domain_page(mfn);
     ent  = ptab[l3_table_offset(addr)];
-    pfn  = machine_to_phys_mapping[(u32)(ent >> PAGE_SHIFT)]; 
+    pfn  = get_pfn_from_mfn((u32)(ent >> PAGE_SHIFT)); 
     printk(" L3 = %"PRIpte" %08lx\n", ent, pfn);
     unmap_domain_page(ptab);
     if ( !(ent & _PAGE_PRESENT) )
@@ -103,7 +103,7 @@
 
     ptab = map_domain_page(mfn);
     ent  = ptab[l2_table_offset(addr)];
-    pfn  = get_pfn_from_mfn(ent >> PAGE_SHIFT);
+    pfn  = get_pfn_from_mfn((u32)(ent >> PAGE_SHIFT));
     printk("  L2 = %"PRIpte" %08lx %s\n", ent, pfn, 
            (ent & _PAGE_PSE) ? "(PSE)" : "");
     unmap_domain_page(ptab);
@@ -113,7 +113,7 @@
 
     ptab = map_domain_page(ent >> PAGE_SHIFT);
     ent  = ptab[l1_table_offset(addr)];
-    pfn  = get_pfn_from_mfn(ent >> PAGE_SHIFT);
+    pfn  = get_pfn_from_mfn((u32)(ent >> PAGE_SHIFT));
     printk("   L1 = %"PRIpte" %08lx\n", ent, pfn);
     unmap_domain_page(ptab);
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog