If the pagefault handler is modified to pass a non-NULL zonelist then an
unnecessary check for a NULL zonelist in constrained_alloc() can be removed.
Signed-off-by: David Rientjes <rient...@google.com>
---
mm/oom_kill.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -208,8 +208,6 @@ static enum oom_constraint constrained_alloc(struct
zonelist *zonelist,
/* Default to all available memory */
*totalpages = totalram_pages + total_swap_pages;
- if (!zonelist)
- return CONSTRAINT_NONE;
/*
* Reach here only when __GFP_NOFAIL is used. So, we should avoid
* to kill current.We have to random task kill in this case.
@@ -696,7 +694,7 @@ void pagefault_out_of_memory(void)
zonelist = node_zonelist(first_memory_node, GFP_KERNEL);
if (try_set_zonelist_oom(zonelist, GFP_KERNEL)) {
- out_of_memory(NULL, 0, 0, NULL, false);
+ out_of_memory(zonelist, 0, 0, NULL, false);
clear_zonelist_oom(zonelist, GFP_KERNEL);
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
