[folded-merged] mm-memcontrol-dump-memorystat-during-cgroup-oom-fix.patch removed from -mm tree

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

 



The patch titled
     Subject: mm-memcontrol-dump-memorystat-during-cgroup-oom-fix
has been removed from the -mm tree.  Its filename was
     mm-memcontrol-dump-memorystat-during-cgroup-oom-fix.patch

This patch was dropped because it was folded into mm-memcontrol-dump-memorystat-during-cgroup-oom.patch

------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: mm-memcontrol-dump-memorystat-during-cgroup-oom-fix

s/kvmalloc/kmalloc/ per Michal

Link: http://lkml.kernel.org/r/20190605161133.GA12453@xxxxxxxxxxx
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/memcontrol.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/mm/memcontrol.c~mm-memcontrol-dump-memorystat-during-cgroup-oom-fix
+++ a/mm/memcontrol.c
@@ -1362,7 +1362,7 @@ static char *memory_stat_format(struct m
 	struct seq_buf s;
 	int i;
 
-	seq_buf_init(&s, kvmalloc(PAGE_SIZE, GFP_KERNEL), PAGE_SIZE);
+	seq_buf_init(&s, kmalloc(PAGE_SIZE, GFP_KERNEL), PAGE_SIZE);
 	if (!s.buffer)
 		return NULL;
 
@@ -1524,7 +1524,7 @@ void mem_cgroup_print_oom_meminfo(struct
 	if (!buf)
 		return;
 	pr_info("%s", buf);
-	kvfree(buf);
+	kfree(buf);
 }
 
 /*
@@ -5762,7 +5762,7 @@ static int memory_stat_show(struct seq_f
 	if (!buf)
 		return -ENOMEM;
 	seq_puts(m, buf);
-	kvfree(buf);
+	kfree(buf);
 	return 0;
 }
 
_

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

mm-memcontrol-dump-memorystat-during-cgroup-oom.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