From: Adrian Bunk - lock_page_cgroup() - unlock_page_cgroup() - __mem_cgroup_move_lists() Additionally, there was no reason for the "mem_control_type" object. Signed-off-by: Adrian Bunk Cc: Balbir Singh Signed-off-by: Andrew Morton --- mm/memcontrol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN mm/memcontrol.c~memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7-cleanup mm/memcontrol.c --- a/mm/memcontrol.c~memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7-cleanup +++ a/mm/memcontrol.c @@ -91,7 +91,7 @@ enum { MEM_CGROUP_TYPE_CACHED, MEM_CGROUP_TYPE_ALL, MEM_CGROUP_TYPE_MAX, -} mem_control_type; +}; static struct mem_cgroup init_mem_cgroup; @@ -151,18 +151,18 @@ struct page_cgroup *page_get_page_con (page->page_cgroup & ~PAGE_CGROUP_LOCK); } -void __always_inline lock_page_cgroup(struct page *page) +static void __always_inline lock_page_cgroup(struct page *page) { bit_spin_lock(PAGE_CGROUP_LOCK_BIT, &page->page_cgroup); VM_BUG_ON(!page_cgroup_locked(page)); } -void __always_inline unlock_page_cgroup(struct page *page) +static void __always_inline unlock_page_cgroup(struct page *page) { bit_spin_unlock(PAGE_CGROUP_LOCK_BIT, &page->page_cgroup); } -void __mem_cgroup_move_lists(struct page_cgroup *pc, bool active) +static void __mem_cgroup_move_lists(struct page_cgroup *pc, bool active) { if (active) list_move(&pc->lru, &pc->mem_cgroup->active_list); _