The patch titled
Subject: mm-oom-cgroup-aware-oom-killer-fix
has been removed from the -mm tree. Its filename was
mm-oom-cgroup-aware-oom-killer-fix.patch
This patch was dropped because it was folded into mm-oom-cgroup-aware-oom-killer.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-oom-cgroup-aware-oom-killer-fix
two tweaks ariseing from merge fixups, per Roman
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/oom_kill.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
--- a/mm/oom_kill.c~mm-oom-cgroup-aware-oom-killer-fix
+++ a/mm/oom_kill.c
@@ -1094,11 +1094,9 @@ bool out_of_memory(struct oom_control *o
return true;
}
- if (mem_cgroup_select_oom_victim(oc)) {
- if (oom_kill_memcg_victim(oc)) {
- delay = true;
- goto out;
- }
+ if (mem_cgroup_select_oom_victim(oc) && oom_kill_memcg_victim(oc)) {
+ delay = true;
+ goto out;
}
select_bad_process(oc);
@@ -1107,7 +1105,7 @@ bool out_of_memory(struct oom_control *o
dump_header(oc, NULL);
panic("Out of memory and no killable processes...\n");
}
- if (oc->chosen_task && oc->chosen_task != (void *)-1UL)
+ if (oc->chosen_task && oc->chosen_task != INFLIGHT_VICTIM)
oom_kill_process(oc, !is_memcg_oom(oc) ? "Out of memory" :
"Memory cgroup out of memory");
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch
mm.patch
tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch
tools-modifying-page-types-to-include-shared-map-counts-fix-checkpatch-fixes.patch
tools-adding-support-for-idle-page-tracking-to-tool-fix.patch
mm-drop-vm_bug_on-from-__get_free_pages-fix.patch
mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch
mm-fadvise-fix-signed-overflow-ubsan-complaint-fix.patch
mm-sparsemem-defer-the-ms-section_mem_map-clearing-fix.patch
mm-sparse-optimize-memmap-allocation-during-sparse_init-checkpatch-fixes.patch
mm-sparse-abstract-sparse-buffer-allocations-fix.patch
mm-sparse-abstract-sparse-buffer-allocations-fix-fix.patch
mm-soft-offline-close-the-race-against-page-allocation-fix.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-checkpatch-fixes.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-fix.patch
mm-zero-out-the-vma-in-vma_init.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-kcore-hold-lock-during-read-fix.patch
kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch
fs-epoll-robustify-irq-safety-with-lockdep_assert_irqs_enabled-fix.patch
checkpatch-check-for-if-0-if-1-fix.patch
checkpatch-warn-when-a-patch-doesnt-have-a-description-fix.patch
fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix.patch
linux-next-rejects.patch
mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.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
