ia64/xen-unstable

changeset 4018:62ae1c72e905

bitkeeper revision 1.1236.12.10 (422ddcefnSKZRvTbeADnwuPWCKuy7w)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Tue Mar 08 17:12:15 2005 +0000 (2005-03-08)
parents f715bcbba0b3 02e17ce32b91
children b74c86e36644 4b51c55ba441
files xen/common/page_alloc.c
line diff
     1.1 --- a/xen/common/page_alloc.c	Tue Mar 08 15:58:14 2005 +0000
     1.2 +++ b/xen/common/page_alloc.c	Tue Mar 08 17:12:15 2005 +0000
     1.3 @@ -393,6 +393,13 @@ void init_xenheap_pages(unsigned long ps
     1.4  
     1.5      memguard_guard_range(__va(ps), pe - ps);
     1.6  
     1.7 +    /*
     1.8 +     * Yuk! Ensure there is a one-page buffer between Xen and Dom zones, to
     1.9 +     * prevent merging of power-of-two blocks across the zone boundary.
    1.10 +     */
    1.11 +    if ( !IS_XEN_HEAP_FRAME(phys_to_page(pe)) )
    1.12 +        pe -= PAGE_SIZE;
    1.13 +
    1.14      local_irq_save(flags);
    1.15      init_heap_pages(MEMZONE_XEN, phys_to_page(ps), (pe - ps) >> PAGE_SHIFT);
    1.16      local_irq_restore(flags);