xen/balloon: remove BUG_ON in increase_reservation
authorWei Liu <wei.liu2@citrix.com>
Wed, 11 Sep 2013 17:54:02 +0000 (17:54 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 11 Sep 2013 17:54:02 +0000 (17:54 +0000)
The BUG_ON in increase_reservation is wrong as we have P2M entry
ballooned out page set to balloon scratch page, so it might have a valid
P2M entry at that point.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
drivers/xen/balloon.c

index 4a43bc31ed3c59936c983b45c3c76bda1ed72334..a50c6e3a7cc4824db07f43e84732ee64a58b65cb 100644 (file)
@@ -349,8 +349,6 @@ static enum bp_state increase_reservation(unsigned long nr_pages)
                BUG_ON(page == NULL);
 
                pfn = page_to_pfn(page);
-               BUG_ON(!xen_feature(XENFEAT_auto_translated_physmap) &&
-                      phys_to_machine_mapping_valid(pfn));
 
                set_phys_to_machine(pfn, frame_list[i]);