summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@citrix.com>2014-09-01 18:52:44 +0100
committerDavid Vrabel <david.vrabel@citrix.com>2014-09-02 15:37:19 +0100
commit3dcf63677d4eb7fdfc13290c8558c301d2588fe8 (patch)
tree07a28fd8d2da37c61fe9ee1bcade6b5c35a72194 /drivers/xen
parent61a734d305e16944b42730ef582a7171dc733321 (diff)
downloadlinux-stable-3dcf63677d4eb7fdfc13290c8558c301d2588fe8.tar.gz
linux-stable-3dcf63677d4eb7fdfc13290c8558c301d2588fe8.tar.bz2
linux-stable-3dcf63677d4eb7fdfc13290c8558c301d2588fe8.zip
xen/balloon: cancel ballooning if adding new memory failed
If the balloon driver is adding additional memory regions to the balloon and add_memory() fails it will likely continuously fail so cancel the balloon operation. Signed-off-by: David Vrabel <david.vrabel@citrix.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/balloon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 5c660c77f03b..1e0a317d3dcd 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -230,8 +230,8 @@ static enum bp_state reserve_additional_memory(long credit)
rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT);
if (rc) {
- pr_info("%s: add_memory() failed: %i\n", __func__, rc);
- return BP_EAGAIN;
+ pr_warn("Cannot add additional memory (%i)\n", rc);
+ return BP_ECANCELED;
}
balloon_hotplug -= credit;