ia64/xen-unstable

changeset 9880:8bf5637cb269

Relax BUG_ON() state ment in increase_reservation() in balloon.c.
When xen_feature(XENFEAT_auto_translated_physmap) = 1,
phys_to_machine_mapping_valid(pfn) always returns true.
Relaxed BUG_ON() for xen_feature(XENFEAT_auto_translated_physmap) = 1 case.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author kaf24@firebug.cl.cam.ac.uk
date Fri Apr 28 08:30:52 2006 +0100 (2006-04-28)
parents e0d986fc0978
children dfdc32a9814f
files linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Thu Apr 27 19:19:59 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Apr 28 08:30:52 2006 +0100
     1.3 @@ -216,7 +216,8 @@ static int increase_reservation(unsigned
     1.4  		BUG_ON(page == NULL);
     1.5  
     1.6  		pfn = page_to_pfn(page);
     1.7 -		BUG_ON(phys_to_machine_mapping_valid(pfn));
     1.8 +		BUG_ON(!xen_feature(XENFEAT_auto_translated_physmap) &&
     1.9 +		       phys_to_machine_mapping_valid(pfn));
    1.10  
    1.11  		/* Update P->M and M->P tables. */
    1.12  		set_phys_to_machine(pfn, frame_list[i]);