|
@@ -3034,7 +3034,6 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...)
|
|
|
va_list args;
|
|
|
static DEFINE_RATELIMIT_STATE(nopage_rs, DEFAULT_RATELIMIT_INTERVAL,
|
|
|
DEFAULT_RATELIMIT_BURST);
|
|
|
- nodemask_t *nm = (nodemask) ? nodemask : &cpuset_current_mems_allowed;
|
|
|
|
|
|
if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs) ||
|
|
|
debug_guardpage_minorder() > 0)
|
|
@@ -3048,11 +3047,16 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...)
|
|
|
pr_cont("%pV", &vaf);
|
|
|
va_end(args);
|
|
|
|
|
|
- pr_cont(", mode:%#x(%pGg), nodemask=%*pbl\n", gfp_mask, &gfp_mask, nodemask_pr_args(nm));
|
|
|
+ pr_cont(", mode:%#x(%pGg), nodemask=", gfp_mask, &gfp_mask);
|
|
|
+ if (nodemask)
|
|
|
+ pr_cont("%*pbl\n", nodemask_pr_args(nodemask));
|
|
|
+ else
|
|
|
+ pr_cont("(null)\n");
|
|
|
+
|
|
|
cpuset_print_current_mems_allowed();
|
|
|
|
|
|
dump_stack();
|
|
|
- warn_alloc_show_mem(gfp_mask, nm);
|
|
|
+ warn_alloc_show_mem(gfp_mask, nodemask);
|
|
|
}
|
|
|
|
|
|
static inline struct page *
|