diff for duplicates of <20150611114042.GC16115@linutronix.de> diff --git a/a/1.txt b/N1/1.txt index f4f2bc5..865330d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -81,3 +81,26 @@ diff --git a/mm/memcontrol.c b/mm/memcontrol.c - /* XXX: caller holds IRQ-safe mapping->tree_lock */ - VM_BUG_ON(!irqs_disabled()); +- ++ local_lock_irqsave(event_lock, flags); + mem_cgroup_charge_statistics(memcg, page, -1); + memcg_check_events(memcg, page); ++ local_unlock_irqrestore(event_lock, flags); + } + + /** + +The only downside for the non-RT version is that local_lock_irqsave() +expands to local_irq_save() (on non-RT) which disables IRQs which are +already disabled - a minor issue if at all. + +Johannes, would you mind using local_lock_irqsave() if it would be +available in vanilla? As you see it documents what is locked :) + +Sebastian + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 0d0e4db..bf211d4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -97,6 +97,29 @@ " \t\tpage_counter_uncharge(&memcg->memory, 1);\n" " \n" "-\t/* XXX: caller holds IRQ-safe mapping->tree_lock */\n" - "-\tVM_BUG_ON(!irqs_disabled());" + "-\tVM_BUG_ON(!irqs_disabled());\n" + "-\n" + "+\tlocal_lock_irqsave(event_lock, flags);\n" + " \tmem_cgroup_charge_statistics(memcg, page, -1);\n" + " \tmemcg_check_events(memcg, page);\n" + "+\tlocal_unlock_irqrestore(event_lock, flags);\n" + " }\n" + " \n" + " /**\n" + "\n" + "The only downside for the non-RT version is that local_lock_irqsave()\n" + "expands to local_irq_save() (on non-RT) which disables IRQs which are\n" + "already disabled - a minor issue if at all.\n" + "\n" + "Johannes, would you mind using local_lock_irqsave() if it would be\n" + "available in vanilla? As you see it documents what is locked :)\n" + "\n" + "Sebastian\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -cd374d104301c73d44c7e69240a6cc3068e4856a96a0e5481b41b5049d869cdd +47a693f0e70278a4c2230d087889932960baaaf3b441b128cfe2a5a79c24af80
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.