diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 91a62e157afbbca347545936679ac10222228cec..d8636b41b37e918c653dc8dba663bdcd16377891 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5601,7 +5601,6 @@ static int mem_cgroup_move_account(struct page *page, unsigned int nr_pages = compound ? hpage_nr_pages(page) : 1; int ret; bool anon; - struct deferred_split *ds_queue; int nid = page_to_nid(page); VM_BUG_ON(from == to); @@ -5648,15 +5647,6 @@ static int mem_cgroup_move_account(struct page *page, __mod_memcg_state(to, NR_WRITEBACK, nr_pages); } -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (compound && !list_empty(page_deferred_list(page))) { - ds_queue = &from->nodeinfo[nid]->deferred_split_queue; - spin_lock(&ds_queue->split_queue_lock); - list_del_init(page_deferred_list(page)); - ds_queue->split_queue_len--; - spin_unlock(&ds_queue->split_queue_lock); - } -#endif /* * It is safe to change page->mem_cgroup here because the page * is referenced, charged, and isolated - we can't race with @@ -5666,17 +5656,6 @@ static int mem_cgroup_move_account(struct page *page, /* caller should have done css_get */ page->mem_cgroup = to; -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (compound && list_empty(page_deferred_list(page))) { - ds_queue = &to->nodeinfo[nid]->deferred_split_queue; - spin_lock(&ds_queue->split_queue_lock); - list_add_tail(page_deferred_list(page), - &ds_queue->split_queue); - ds_queue->split_queue_len++; - spin_unlock(&ds_queue->split_queue_lock); - } -#endif - spin_unlock_irqrestore(&from->move_lock, flags); ret = 0;