diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-10-23 12:19:36 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-10-23 12:19:36 -0400 |
| commit | d6023b78778d37e416158b9bb396d26c36d64701 (patch) | |
| tree | c1ea200040798841aa1d47a19e3d255b209b8fef /mm | |
| parent | 77db3e1ac42e19bb57b3e6f51fa7d4eb255d661c (diff) | |
| parent | dc3a8b0c212a563bf21c91ac9e776a0875861d3f (diff) | |
Merge tag 'v3.4.66' into v3.4-rt
This is the 3.4.66 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page_alloc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bbda9bcd4f1e..66dfc57f895e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1942,6 +1942,13 @@ void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...) return; /* + * Walking all memory to count page types is very expensive and should + * be inhibited in non-blockable contexts. + */ + if (!(gfp_mask & __GFP_WAIT)) + filter |= SHOW_MEM_FILTER_PAGE_COUNT; + + /* * This documents exceptions given to allocations in certain * contexts that are allowed to allocate outside current's set * of allowed nodes. |