[Xen-changelog] [xen-unstable] [XEN] Fix memory allocator after recent bootmem change.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 7b6aba313aac0b32f16f4c0cac768762cf246ed5
# Parent  664e762a10e8f6a79cf5e13db818a6418909fa97
[XEN] Fix memory allocator after recent bootmem change.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/common/page_alloc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -r 664e762a10e8 -r 7b6aba313aac xen/common/page_alloc.c
--- a/xen/common/page_alloc.c   Thu Dec 14 15:12:38 2006 +0000
+++ b/xen/common/page_alloc.c   Thu Dec 14 15:43:40 2006 +0000
@@ -295,7 +295,7 @@ void end_boot_allocator(void)
 void end_boot_allocator(void)
 {
     unsigned long i, j, k;
-    int curr_free = 0, next_free = 0;
+    int curr_free, next_free;
 
     memset(avail, 0, sizeof(avail));
 
@@ -305,6 +305,8 @@ void end_boot_allocator(void)
                 INIT_LIST_HEAD(&heap[i][j][k]);
 
     /* Pages that are free now go to the domain sub-allocator. */
+    if ( (curr_free = next_free = !allocated_in_map(first_valid_mfn)) )
+        map_alloc(first_valid_mfn, 1);
     for ( i = first_valid_mfn; i < max_page; i++ )
     {
         curr_free = next_free;

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