A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

memcg: remove mem_cgroup_uncharge

Browse source 
Nothing uses mem_cgroup_uncharge apart from mem_cgroup_uncharge_page, (a
trivial wrapper around it) and mem_cgroup_end_migration (which does the same
as mem_cgroup_uncharge_page).  And it often ends up having to lock just to let
its caller unlock.  Remove it (but leave the silly locking until a later
patch).

Moved mem_cgroup_cache_charge next to mem_cgroup_charge in memcontrol.h.

Signed-off-by: Hugh Dickins <[email protected]>
Cc: David Rientjes <[email protected]>
Acked-by: Balbir Singh <[email protected]>
Acked-by: KAMEZAWA Hiroyuki <[email protected]>
Cc: Hirokazu Takahashi <[email protected]>
Cc: YAMAMOTO Takashi <[email protected]>
Cc: Paul Menage <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Hugh Dickins 2008-03-04 14:29:08 -08:00 • committed by Linus Torvalds
commit 8289546e57
2 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mm/memcontrol.c
View file

@ -697,20 +697,22 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
/*
* Uncharging is always a welcome operation, we never complain, simply
* uncharge. This routine should be called with lock_page_cgroup held
* uncharge.
*/
void mem_cgroup_uncharge(struct page_cgroup *pc)
void mem_cgroup_uncharge_page(struct page *page)
{
struct page_cgroup *pc;
struct mem_cgroup *mem;
struct mem_cgroup_per_zone *mz;
struct page *page;
unsigned long flags;
/*
* Check if our page_cgroup is valid
*/
lock_page_cgroup(page);
pc = page_get_page_cgroup(page);
if (!pc)
return;
goto unlock;
if (atomic_dec_and_test(&pc->ref_cnt)) {
page = pc->page;
@ -731,12 +733,8 @@ void mem_cgroup_uncharge(struct page_cgroup *pc)
}
lock_page_cgroup(page);
}
}
void mem_cgroup_uncharge_page(struct page *page)
{
lock_page_cgroup(page);
mem_cgroup_uncharge(page_get_page_cgroup(page));
unlock:
unlock_page_cgroup(page);
}
@ -759,12 +757,7 @@ int mem_cgroup_prepare_migration(struct page *page)
void mem_cgroup_end_migration(struct page *page)
{
struct page_cgroup *pc;
lock_page_cgroup(page);
pc = page_get_page_cgroup(page);
mem_cgroup_uncharge(pc);
unlock_page_cgroup(page);
mem_cgroup_uncharge_page(page);
}
/*
* We know both *page* and *newpage* are now not-on-LRU and Pg_locked.