summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorWei Liu <wei.liu2@citrix.com>2013-09-11 21:54:02 +0400
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2013-09-11 21:54:02 +0400
commit6a6f6e72eca5ed999689c69d1ac411fe319844a0 (patch)
treeaefcc4c59c7312ee968a2b7897cd01dd0351c0dd /drivers/xen
parent2bad07ce28a0f61c1e776f99aa05f85e4e689e24 (diff)
downloadlinux-6a6f6e72eca5ed999689c69d1ac411fe319844a0.tar.xz
xen/balloon: remove BUG_ON in increase_reservation
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>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/balloon.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 4a43bc31ed3c..a50c6e3a7cc4 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -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]);