mm-cleanup-some-useless-code.patch removed from -mm tree
The patch titled
Subject: mm/memcontrol.c: cleanup some useless code
has been removed from the -mm tree. Its filename was
mm-cleanup-some-useless-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Kaitao Cheng <[email protected]>
Subject: mm/memcontrol.c: cleanup some useless code
Compound pages handling in mem_cgroup_migrate is more convoluted than necessary. The state is duplicated in compound variable and the same could be achieved by PageTransHuge check which is trivial and hpage_nr_pages is already PageTransHuge aware.
It is much simpler to just use hpage_nr_pages for nr_pages and replace the local variable by PageTransHuge check directly
---
mm/memcontrol.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-cleanup-some-useless-code +3 -4
@@ -6633,7 +6633,6 @@ void mem_cgroup_migrate(struct page *old {struct mem_cgroup *memcg;unsigned int nr_pages; -bool compound;unsigned long flags;VM_BUG_ON_PAGE (!PageLocked (oldpage), oldpage);
@@ -6655,8 +6654,7 @@ void mem_cgroup_migrate(struct page *oldreturn ;/* Force-charge the new page. The old one will be freed soon */ - compound =PageTransHuge (newpage); - nr_pages = compound ?hpage_nr_pages (newpage) :1 ; + nr_pages =hpage_nr_pages (newpage);page_counter_charge (&memcg->memory, nr_pages);if (do_memsw_account ())
@@ -6666,7 +6664,8 @@ void mem_cgroup_migrate(struct page *oldcommit_charge (newpage, memcg, false);local_irq_save (flags); -mem_cgroup_charge_statistics (memcg, newpage, compound, nr_pages); +mem_cgroup_charge_statistics (memcg, newpage,PageTransHuge (newpage), + nr_pages);memcg_check_events (memcg, newpage);local_irq_restore (flags); }
_
Patches currently in -mm which might be from [email protected] are