The patch titled Subject: fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes-fix has been removed from the -mm tree. Its filename was fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes-fix.patch This patch was dropped because it was folded into fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes-fix add comment Cc: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/seq_file.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN fs/seq_file.c~fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes-fix fs/seq_file.c --- a/fs/seq_file.c~fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes-fix +++ a/fs/seq_file.c @@ -36,6 +36,10 @@ static void *seq_buf_alloc(unsigned long { void *buf; + /* + * __GFP_NORETRY to avoid oom-killings with high-order allocations - + * it's better to fall back to vmalloc() than to kill things. + */ buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); if (!buf && size > PAGE_SIZE) buf = vmalloc(size); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-mincore-add-hwpoison-page-handle.patch include-linux-kmemleakh-needs-slabh.patch mm-page_owner-keep-track-of-page-owners.patch fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch oom-dont-assume-that-a-coredumping-thread-will-exit-soon-v2-fix.patch mm-memcontrol-fix-defined-but-not-used-compiler-warning-fix.patch zsmalloc-fix-zs_init-cpu-notifier-error-handling-fix-2.patch zsmalloc-fix-zs_init-cpu-notifier-error-handling-fix.patch mm-zsmalloc-support-allocating-obj-with-size-of-zs_max_alloc_size-fix.patch mm-zsmalloc-avoid-duplicate-assignment-of-prev_class-fix.patch ipc-semc-chance-memory-barrier-in-sem_lock-to-smp_rmb-fix.patch ipc-semc-chance-memory-barrier-in-sem_lock-to-smp_rmb-fix-fix.patch ipc-msg-increase-msgmni-remove-scaling-checkpatch-fixes.patch mm-cma-make-kmemleak-ignore-cma-regions.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html