From patchwork Thu Apr 22 02:52:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rusty Russell X-Patchwork-Id: 93990 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3M2r6Pw023573 for ; Thu, 22 Apr 2010 02:53:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754397Ab0DVCwm (ORCPT ); Wed, 21 Apr 2010 22:52:42 -0400 Received: from ozlabs.org ([203.10.76.45]:35956 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755905Ab0DVCwj (ORCPT ); Wed, 21 Apr 2010 22:52:39 -0400 Received: from vivaldi.localnet (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 168D0B7D19; Thu, 22 Apr 2010 12:52:38 +1000 (EST) From: Rusty Russell To: Linus Torvalds Subject: [PATCH] virtio: Fix GFP flags passed from the virtio balloon driver Date: Thu, 22 Apr 2010 12:22:34 +0930 User-Agent: KMail/1.12.2 (Linux/2.6.31-19-generic; KDE/4.3.2; i686; ; ) Cc: balbir@linux.vnet.ibm.com, kvm , Avi Kivity , "linux-mm@kvack.org" , virtualization@lists.linux-foundation.org References: <20100421190704.GK3994@balbir.in.ibm.com> In-Reply-To: <20100421190704.GK3994@balbir.in.ibm.com> MIME-Version: 1.0 Message-Id: <201004221222.36014.rusty@rustcorp.com.au> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 22 Apr 2010 02:53:07 +0000 (UTC) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 369f2ee..f8ffe8c 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -102,7 +102,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,