aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/page_alloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fe14a8c87fc2..1e49dc7cd619 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -903,8 +903,7 @@ restart:
903 alloc_flags |= ALLOC_HARDER; 903 alloc_flags |= ALLOC_HARDER;
904 if (gfp_mask & __GFP_HIGH) 904 if (gfp_mask & __GFP_HIGH)
905 alloc_flags |= ALLOC_HIGH; 905 alloc_flags |= ALLOC_HIGH;
906 if (wait) 906 alloc_flags |= ALLOC_CPUSET;
907 alloc_flags |= ALLOC_CPUSET;
908 907
909 /* 908 /*
910 * Go through the zonelist again. Let __GFP_HIGH and allocations 909 * Go through the zonelist again. Let __GFP_HIGH and allocations
@@ -926,7 +925,7 @@ restart:
926nofail_alloc: 925nofail_alloc:
927 /* go through the zonelist yet again, ignoring mins */ 926 /* go through the zonelist yet again, ignoring mins */
928 page = get_page_from_freelist(gfp_mask, order, 927 page = get_page_from_freelist(gfp_mask, order,
929 zonelist, ALLOC_NO_WATERMARKS|ALLOC_CPUSET); 928 zonelist, ALLOC_NO_WATERMARKS);
930 if (page) 929 if (page)
931 goto got_pg; 930 goto got_pg;
932 if (gfp_mask & __GFP_NOFAIL) { 931 if (gfp_mask & __GFP_NOFAIL) {