diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fe14a8c87fc27d8822faeaff71cf990f6f9a95ef..1e49dc7cd61969c49cef5185ff1e424be11b6815 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -903,8 +903,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 		alloc_flags |= ALLOC_HARDER;
 	if (gfp_mask & __GFP_HIGH)
 		alloc_flags |= ALLOC_HIGH;
-	if (wait)
-		alloc_flags |= ALLOC_CPUSET;
+	alloc_flags |= ALLOC_CPUSET;
 
 	/*
 	 * Go through the zonelist again. Let __GFP_HIGH and allocations
@@ -926,7 +925,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 nofail_alloc:
 			/* go through the zonelist yet again, ignoring mins */
 			page = get_page_from_freelist(gfp_mask, order,
-				zonelist, ALLOC_NO_WATERMARKS|ALLOC_CPUSET);
+				zonelist, ALLOC_NO_WATERMARKS);
 			if (page)
 				goto got_pg;
 			if (gfp_mask & __GFP_NOFAIL) {