diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f97b5a1700a4..eb6c50cc8880 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -3367,26 +3367,12 @@ try_this_zone: | |||
3367 | return NULL; | 3367 | return NULL; |
3368 | } | 3368 | } |
3369 | 3369 | ||
3370 | /* | ||
3371 | * Large machines with many possible nodes should not always dump per-node | ||
3372 | * meminfo in irq context. | ||
3373 | */ | ||
3374 | static inline bool should_suppress_show_mem(void) | ||
3375 | { | ||
3376 | bool ret = false; | ||
3377 | |||
3378 | #if NODES_SHIFT > 8 | ||
3379 | ret = in_interrupt(); | ||
3380 | #endif | ||
3381 | return ret; | ||
3382 | } | ||
3383 | |||
3384 | static void warn_alloc_show_mem(gfp_t gfp_mask, nodemask_t *nodemask) | 3370 | static void warn_alloc_show_mem(gfp_t gfp_mask, nodemask_t *nodemask) |
3385 | { | 3371 | { |
3386 | unsigned int filter = SHOW_MEM_FILTER_NODES; | 3372 | unsigned int filter = SHOW_MEM_FILTER_NODES; |
3387 | static DEFINE_RATELIMIT_STATE(show_mem_rs, HZ, 1); | 3373 | static DEFINE_RATELIMIT_STATE(show_mem_rs, HZ, 1); |
3388 | 3374 | ||
3389 | if (should_suppress_show_mem() || !__ratelimit(&show_mem_rs)) | 3375 | if (!__ratelimit(&show_mem_rs)) |
3390 | return; | 3376 | return; |
3391 | 3377 | ||
3392 | /* | 3378 | /* |