ia64/xen-unstable

changeset 3633:1c43dbcfc46f

bitkeeper revision 1.1159.212.79 (42025949UaM5lFgjnH_ynRCAqL6hhQ)

Merge planb.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-2.0-testing.bk
into planb.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk
author kaf24@planb.cl.cam.ac.uk
date Thu Feb 03 17:03:05 2005 +0000 (2005-02-03)
parents 677cb76cff18 5f3b5a2eb615
children d1bedbc0f20a 10b8afffe96b
files BitKeeper/etc/logging_ok xen/common/page_alloc.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Thu Feb 03 14:45:50 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Thu Feb 03 17:03:05 2005 +0000
     1.3 @@ -33,6 +33,7 @@ kaf24@freefall.cl.cam.ac.uk
     1.4  kaf24@labyrinth.cl.cam.ac.uk
     1.5  kaf24@pb001.cl.cam.ac.uk
     1.6  kaf24@penguin.local
     1.7 +kaf24@planb.cl.cam.ac.uk
     1.8  kaf24@plym.cl.cam.ac.uk
     1.9  kaf24@scramble.cl.cam.ac.uk
    1.10  kaf24@striker.cl.cam.ac.uk
     2.1 --- a/xen/common/page_alloc.c	Thu Feb 03 14:45:50 2005 +0000
     2.2 +++ b/xen/common/page_alloc.c	Thu Feb 03 17:03:05 2005 +0000
     2.3 @@ -177,7 +177,7 @@ unsigned long alloc_boot_pages(unsigned 
     2.4      size  = round_pgup(size) >> PAGE_SHIFT;
     2.5      align = round_pgup(align) >> PAGE_SHIFT;
     2.6  
     2.7 -    for ( pg = 0; (pg + size) < (bitmap_size*PAGES_PER_MAPWORD); pg += align )
     2.8 +    for ( pg = 0; (pg + size) < (bitmap_size*8); pg += align )
     2.9      {
    2.10          for ( i = 0; i < size; i++ )
    2.11              if ( allocated_in_map(pg + i) )