[folded-merged] mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers-fix.patch removed from -mm tree

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

 



The patch titled
     Subject: mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers-fix
has been removed from the -mm tree.  Its filename was
     mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers-fix.patch

This patch was dropped because it was folded into mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers.patch

------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers-fix

"array subscript is above array bounds"

Link: http://lkml.kernel.org/r/20180406155441.GA20806@xxxxxxxxxxx
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---


diff -puN mm/memcontrol.c~mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers-fix mm/memcontrol.c
--- a/mm/memcontrol.c~mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers-fix
+++ a/mm/memcontrol.c
@@ -5199,8 +5199,7 @@ static int memory_events_show(struct seq
 		   atomic_long_read(&memcg->memory_events[MEMCG_MAX]));
 	seq_printf(m, "oom %lu\n",
 		   atomic_long_read(&memcg->memory_events[MEMCG_OOM]));
-	seq_printf(m, "oom_kill %lu\n",
-		   atomic_long_read(&memcg->memory_events[OOM_KILL]));
+	seq_printf(m, "oom_kill %lu\n", memcg_sum_events(memcg, OOM_KILL));
 
 	return 0;
 }
_

Patches currently in -mm which might be from hannes@xxxxxxxxxxx are

mm-memcg-make-sure-memoryevents-is-uptodate-when-waking-pollers.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



[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