1.1 --- a/xen/common/page_alloc.c	Tue Jan 11 19:41:53 2011 +0000
     1.2 +++ b/xen/common/page_alloc.c	Wed Jan 12 10:53:56 2011 +0000
     1.3 @@ -527,7 +527,7 @@ static int reserve_offlined_page(struct 
     1.4  static void free_heap_pages(
     1.5      struct page_info *pg, unsigned int order)
     1.6  {
     1.7 -    unsigned long mask, mfn = page_to_mfn(pg);
     1.8 +    unsigned long mask;
     1.9      unsigned int i, node = phys_to_nid(page_to_maddr(pg)), tainted = 0;
    1.10      unsigned int zone = page_to_zone(pg);
    1.11  
    1.12 @@ -538,10 +538,6 @@ static void free_heap_pages(
    1.13  
    1.14      for ( i = 0; i < (1 << order); i++ )
    1.15      {
    1.16 -        /* This page is not a guest frame any more. */
    1.17 -        page_set_owner(&pg[i], NULL); /* set_gpfn_from_mfn snoops pg owner */
    1.18 -        set_gpfn_from_mfn(mfn + i, INVALID_M2P_ENTRY);
    1.19 -
    1.20          /*
    1.21           * Cannot assume that count_info == 0, as there are some corner cases
    1.22           * where it isn't the case and yet it isn't a bug: