On Thu, 22 Dec 2011 11:43:39 +0100 Michal Hocko <mhocko@xxxxxxx> wrote: > On Thu 22-12-11 12:53:10, Glauber Costa wrote: > > 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. > > "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@xxxxxxxxxxxxx> > > CC: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx> > > CC: Paul Menage <paul@xxxxxxxxxxxxxx> > > CC: Greg Thelen <gthelen@xxxxxxxxxx> > > CC: Johannes Weiner <jweiner@xxxxxxxxxx> > > CC: Michal Hocko <mhocko@xxxxxxx> > > CC: David S. Miller <davem@xxxxxxxxxxxxx> > > Acked-by: Michal Hocko <mhocko@xxxxxxx> > Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html