mm/memblock: define memblock_physmem_add()

[linux-2.6-microblaze.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 27c231b..6f6dc87 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6633,7 +6633,6 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
 {
        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 *oldpage, struct page *newpage)
                return;
 
        /* 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 *oldpage, struct page *newpage)
        commit_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);
 }