|
@@ -5835,9 +5835,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
|
|
if (!mem_cgroup_is_root(memcg))
|
|
if (!mem_cgroup_is_root(memcg))
|
|
page_counter_uncharge(&memcg->memory, 1);
|
|
page_counter_uncharge(&memcg->memory, 1);
|
|
|
|
|
|
- /* XXX: caller holds IRQ-safe mapping->tree_lock */
|
|
|
|
- VM_BUG_ON(!irqs_disabled());
|
|
|
|
-
|
|
|
|
|
|
+ /* Caller disabled preemption with mapping->tree_lock */
|
|
mem_cgroup_charge_statistics(memcg, page, -1);
|
|
mem_cgroup_charge_statistics(memcg, page, -1);
|
|
memcg_check_events(memcg, page);
|
|
memcg_check_events(memcg, page);
|
|
}
|
|
}
|