---

yaml --- r: 273275 b: refs/heads/master c: 6d994a7 h: refs/heads/master i: 273273: a8a0ff5 273271: 916c179 v: v3
git-mirror · Nov 2, 2011 · 91ab9a5 · 91ab9a5
1 parent 137aefb
commit 91ab9a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -412,14 +412,14 @@ 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)
 			STATS_INC(b->stats.alloc);
 		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)