summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2011-03-23 16:42:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 19:46:27 -0700
commitde3638d9cdc89ac899225996b8dcedbcbc53bdd2 (patch)
tree86293e32728fdd5696cd321bc65aec09c89d17f3 /include
parent97a6c37b34f46feed2544bd40891ee6dd0fd1554 (diff)
downloadkernel-common-de3638d9cdc89ac899225996b8dcedbcbc53bdd2.tar.gz
kernel-common-de3638d9cdc89ac899225996b8dcedbcbc53bdd2.tar.bz2
kernel-common-de3638d9cdc89ac899225996b8dcedbcbc53bdd2.zip
memcg: fold __mem_cgroup_move_account into caller
It is one logical function, no need to have it split up. Also, get rid of some checks from the inner function that ensured the sanity of the outer function. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Minchan Kim <minchan.kim@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/page_cgroup.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 363bbc8b0f49..6b63679ce8a1 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -99,11 +99,6 @@ static inline void unlock_page_cgroup(struct page_cgroup *pc)
bit_spin_unlock(PCG_LOCK, &pc->flags);
}
-static inline int page_is_cgroup_locked(struct page_cgroup *pc)
-{
- return bit_spin_is_locked(PCG_LOCK, &pc->flags);
-}
-
static inline void move_lock_page_cgroup(struct page_cgroup *pc,
unsigned long *flags)
{