diff options
author | Glauber Costa <glommer@parallels.com> | 2011-12-22 01:02:27 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-22 22:37:18 -0500 |
commit | 65c64ce8ee642eb330a4c4d94b664725f2902b44 (patch) | |
tree | c4ad98c2a7f839f3b968fae6eddeec8b5752ce49 /net/netlink | |
parent | 7d6c429b263c2f735f3df8c282cc77a8659e5d74 (diff) | |
download | op-kernel-dev-65c64ce8ee642eb330a4c4d94b664725f2902b44.zip op-kernel-dev-65c64ce8ee642eb330a4c4d94b664725f2902b44.tar.gz |
Partial revert "Basic kernel memory functionality for the Memory Controller"
This reverts commit e5671dfae59b165e2adfd4dfbdeab11ac8db5bda.
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>
Diffstat (limited to 'net/netlink')
0 files changed, 0 insertions, 0 deletions