# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID 9a39580dffc0a5f92d18bcd2098b786118ed6a71
# Parent  d3427ce2d019077d34cc05be318be101122f49df
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.
PATCHNAME: balloon_driver_relax_bug_on

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r d3427ce2d019 -r 9a39580dffc0 linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Apr 28 11:10:24 2006 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Apr 28 15:20:20 2006 +0900
@@ -216,7 +216,8 @@ static int increase_reservation(unsigned
 		BUG_ON(page == NULL);
 
 		pfn = page_to_pfn(page);
-		BUG_ON(phys_to_machine_mapping_valid(pfn));
+		BUG_ON(!xen_feature(XENFEAT_auto_translated_physmap) &&
+		       phys_to_machine_mapping_valid(pfn));
 
 		/* Update P->M and M->P tables. */
 		set_phys_to_machine(pfn, frame_list[i]);