]> git.baikalelectronics.ru Git - kernel.git/commit
Partial revert "Basic kernel memory functionality for the Memory Controller"
authorGlauber Costa <glommer@parallels.com>
Thu, 22 Dec 2011 01:02:27 +0000 (01:02 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Dec 2011 03:37:18 +0000 (22:37 -0500)
commit5ba7f209489cd2b958edede57432a43f941056c6
treec4ad98c2a7f839f3b968fae6eddeec8b5752ce49
parent4fae7c6c2283562bf716441ed07eeaba4e3f8fd9
Partial revert "Basic kernel memory functionality for the Memory Controller"

This reverts commit c0b4354086359811646ba3f817505fee81588ae5.

After a follow up discussion with Michal, it was agreed it would
be better to leave the kmem controller with just the tcp files,
deferring the behavior of the other general memory.kmem.* files
for a later time, when more caches are controlled. This is because
generic kmem files are not used by tcp accounting and it is
not clear how other slab caches would fit into the scheme.

We are reverting the original commit so we can track the reference.
Part of the patch is kept, because it was used by the later tcp
code. Conflicts are shown in the bottom. init/Kconfig is removed from
the revert entirely.

Signed-off-by: Glauber Costa <glommer@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
CC: Kirill A. Shutemov <kirill@shutemov.name>
CC: Paul Menage <paul@paulmenage.org>
CC: Greg Thelen <gthelen@google.com>
CC: Johannes Weiner <jweiner@redhat.com>
CC: David S. Miller <davem@davemloft.net>
Conflicts:

Documentation/cgroups/memory.txt
mm/memcontrol.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Documentation/cgroups/memory.txt
mm/memcontrol.c