From 91ab9a5992e8ceff1a376550dbeb0b818aa6e0f9 Mon Sep 17 00:00:00 2001 From: Rakib Mullick Date: Wed, 2 Nov 2011 13:40:04 -0700 Subject: [PATCH] --- yaml --- r: 273275 b: refs/heads/master c: 6d994a7e42ab219ba3c10d5ffccf20990252881e h: refs/heads/master i: 273273: a8a0ff5448604099fc8a9af0cd4b19faa713ab24 273271: 916c179141f0ff39919cf7f1002f3f42f220ac7d v: v3 --- [refs] | 2 +- trunk/drivers/misc/vmw_balloon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b33825148b7e..1699e313496d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fd306c85adcde7209281cb663dd8ea247e97cc3 +refs/heads/master: 6d994a7e42ab219ba3c10d5ffccf20990252881e diff --git a/trunk/drivers/misc/vmw_balloon.c b/trunk/drivers/misc/vmw_balloon.c index 053d36caf955..6983d80563cb 100644 --- a/trunk/drivers/misc/vmw_balloon.c +++ b/trunk/drivers/misc/vmw_balloon.c @@ -412,6 +412,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep) gfp_t flags; unsigned int hv_status; bool locked = false; + flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP; do { if (!can_sleep) @@ -419,7 +420,6 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep) else STATS_INC(b->stats.sleep_alloc); - flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP; page = alloc_page(flags); if (!page) { if (!can_sleep)