aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/page_alloc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 104e69ca55e0..bd4de592dc23 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -845,21 +845,22 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
845 845
846 might_sleep_if(wait); 846 might_sleep_if(wait);
847 847
848restart:
848 z = zonelist->zones; /* the list of zones suitable for gfp_mask */ 849 z = zonelist->zones; /* the list of zones suitable for gfp_mask */
849 850
850 if (unlikely(*z == NULL)) { 851 if (unlikely(*z == NULL)) {
851 /* Should this ever happen?? */ 852 /* Should this ever happen?? */
852 return NULL; 853 return NULL;
853 } 854 }
854restart: 855
855 page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, order, 856 page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, order,
856 zonelist, ALLOC_CPUSET); 857 zonelist, ALLOC_CPUSET);
857 if (page) 858 if (page)
858 goto got_pg; 859 goto got_pg;
859 860
860 do 861 do {
861 wakeup_kswapd(*z, order); 862 wakeup_kswapd(*z, order);
862 while (*(++z)); 863 } while (*(++z));
863 864
864 /* 865 /*
865 * OK, we're below the kswapd watermark and have kicked background 866 * OK, we're below the kswapd watermark and have kicked background