[Xen-changelog] [xen-unstable] Revert 22706:ca10302ac285 "xenpaging: update machine_to_phys_mapping[] during page deallocation"

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1294829636 0
# Node ID c3e478eafabce2840a170da0fbc92458afb95386
# Parent  548c29920f682d30ac5f1d692e66f0f990e161c1
Revert 22706:ca10302ac285 "xenpaging: update machine_to_phys_mapping[] during 
page deallocation"

Crashes during boot, due to m2p tables not being set up early enough.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
 xen/common/page_alloc.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

diff -r 548c29920f68 -r c3e478eafabc xen/common/page_alloc.c
--- a/xen/common/page_alloc.c   Tue Jan 11 19:41:53 2011 +0000
+++ b/xen/common/page_alloc.c   Wed Jan 12 10:53:56 2011 +0000
@@ -527,7 +527,7 @@ static void free_heap_pages(
 static void free_heap_pages(
     struct page_info *pg, unsigned int order)
 {
-    unsigned long mask, mfn = page_to_mfn(pg);
+    unsigned long mask;
     unsigned int i, node = phys_to_nid(page_to_maddr(pg)), tainted = 0;
     unsigned int zone = page_to_zone(pg);
 
@@ -538,10 +538,6 @@ static void free_heap_pages(
 
     for ( i = 0; i < (1 << order); i++ )
     {
-        /* This page is not a guest frame any more. */
-        page_set_owner(&pg[i], NULL); /* set_gpfn_from_mfn snoops pg owner */
-        set_gpfn_from_mfn(mfn + i, INVALID_M2P_ENTRY);
-
         /*
          * Cannot assume that count_info == 0, as there are some corner cases
          * where it isn't the case and yet it isn't a bug:

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