diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2014-07-17 10:57:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 10:57:57 +1000 |
| commit | 68a89e0ce56f38058d3d00d255c858a1bc03d4e7 (patch) | |
| tree | 140147d37e5b0ecfe5c72c8fcedba472d3b33cc4 /mm | |
| parent | dc98c8fa59d8c0761f87bc834322eb41d280cc4f (diff) | |
mm-vmallocc-add-a-schedule-point-to-vmalloc-fix
only do it for __GFP_WAIT, per David
Cc: David Rientjes <rientjes@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/vmalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index a7c779d3ffa6..a3cad905f560 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1602,7 +1602,8 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, goto fail; } area->pages[i] = page; - cond_resched(); + if (gfp_mask & __GFP_WAIT) + cond_resched(); } if (map_vm_area(area, prot, &pages)) |