[Xen-changelog] Merge maf46@xxxxxxxxxxxxxxxxxxxxxxx:/usr/groups/xeno/BK/xen-unstable.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1423.1.47, 2005/05/10 12:15:37+01:00, mafetter@xxxxxxxxxxxxxxxx

        Merge maf46@xxxxxxxxxxxxxxxxxxxxxxx:/usr/groups/xeno/BK/xen-unstable.bk
        into fleming.research:/scratch/fleming/mafetter/xen.work



 shadow.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


diff -Nru a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
--- a/xen/arch/x86/shadow.c     2005-05-10 11:06:05 -04:00
+++ b/xen/arch/x86/shadow.c     2005-05-10 11:06:05 -04:00
@@ -808,12 +808,15 @@
     struct pfn_info *page, *l2page;
     l2_pgentry_t *l2;
     unsigned long mfn, pfn;
-    struct map_dom_mem_cache l2cache = MAP_DOM_MEM_CACHE_INIT;
-    struct map_dom_mem_cache l1cache = MAP_DOM_MEM_CACHE_INIT;
+    struct map_dom_mem_cache l1cache, l2cache;
 
     l2page = alloc_domheap_page(NULL);
-    if ( !l2page )
+    if ( l2page == NULL )
         return 0;
+
+    init_map_domain_mem_cache(&l1cache);
+    init_map_domain_mem_cache(&l2cache);
+
     d->arch.phys_table = mk_pagetable(page_to_phys(l2page));
     l2 = map_domain_mem_with_cache(page_to_phys(l2page), &l2cache);
     memset(l2, 0, PAGE_SIZE);
@@ -848,8 +851,8 @@
         list_ent = page->list.next;
     }
 
-    unmap_domain_mem_cache(&l2cache);
-    unmap_domain_mem_cache(&l1cache);
+    destroy_map_domain_mem_cache(&l2cache);
+    destroy_map_domain_mem_cache(&l1cache);
 
     return 1;
 }

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