]> git.openpandora.org Git - pandora-kernel.git/commitdiff
memcg: zap __memcg_{charge,uncharge}_slab
authorVladimir Davydov <vdavydov@parallels.com>
Tue, 10 Feb 2015 22:11:41 +0000 (14:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Feb 2015 22:30:34 +0000 (14:30 -0800)
They are simple wrappers around memcg_{charge,uncharge}_kmem, so let's
zap them and call these functions directly.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/memcontrol.h
mm/memcontrol.c
mm/slab.h

Simple merge
diff --cc mm/memcontrol.c
Simple merge
diff --cc mm/slab.h
Simple merge