[folded-merged] mm-oom-remove-oom_lock-from-oom_reaper-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-oom-remove-oom_lock-from-oom_reaper-fix
has been removed from the -mm tree.  Its filename was
     mm-oom-remove-oom_lock-from-oom_reaper-fix.patch

This patch was dropped because it was folded into mm-oom-remove-oom_lock-from-oom_reaper.patch

------------------------------------------------------
From: Michal Hocko <mhocko@xxxxxxxxxx>
Subject: mm-oom-remove-oom_lock-from-oom_reaper-fix

oom_reap_task_mm should return false when __oom_reap_task_mm return
false. This is what my patch did but it seems this changed by
http://www.ozlabs.org/~akpm/mmotm/broken-out/mm-oom-remove-oom_lock-from-oom_reaper.patch
so that one should be fixed.

Link: http://lkml.kernel.org/r/20180724141747.GP28386@xxxxxxxxxxxxxx

Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/oom_kill.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/oom_kill.c~mm-oom-remove-oom_lock-from-oom_reaper-fix
+++ a/mm/oom_kill.c
@@ -557,7 +557,7 @@ static bool oom_reap_task_mm(struct task
 	/* failed to reap part of the address space. Try again later */
 	if (!__oom_reap_task_mm(mm)) {
 		up_read(&mm->mmap_sem);
-		return true;
+		return false;
 	}
 
 	pr_info("oom_reaper: reaped process %d (%s), now anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n",
_

Patches currently in -mm which might be from mhocko@xxxxxxxxxx are

mm-oom-remove-oom_lock-from-oom_reaper.patch
mm-oom_killc-clean-up-oom_reap_task_mm.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux