From 5034592c4bb15e5a0665f0aa1bb0a0551d3df21e Mon Sep 17 00:00:00 2001 From: Balbir Singh Date: Thu, 22 Apr 2010 12:22:34 +0930 Subject: [PATCH] --- yaml --- r: 190114 b: refs/heads/master c: 61fb06cc8e68906fb29d67bd5b6c2d50a95fc9e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/virtio/virtio_balloon.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5a639ecd89a4..277231d6320b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7b6cf005b59ff5a4dba10338954c3dcfc75ef7b +refs/heads/master: 61fb06cc8e68906fb29d67bd5b6c2d50a95fc9e5 diff --git a/trunk/drivers/virtio/virtio_balloon.c b/trunk/drivers/virtio/virtio_balloon.c index 3aed38886f94..bfec7c29486d 100644 --- a/trunk/drivers/virtio/virtio_balloon.c +++ b/trunk/drivers/virtio/virtio_balloon.c @@ -103,7 +103,8 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num) num = min(num, ARRAY_SIZE(vb->pfns)); for (vb->num_pfns = 0; vb->num_pfns < num; vb->num_pfns++) { - struct page *page = alloc_page(GFP_HIGHUSER | __GFP_NORETRY); + struct page *page = alloc_page(GFP_HIGHUSER | __GFP_NORETRY | + __GFP_NOMEMALLOC | __GFP_NOWARN); if (!page) { if (printk_ratelimit()) dev_printk(KERN_INFO, &vb->vdev->dev,