diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-26 17:28:18 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-26 17:28:18 -0400 |
| commit | 82d52a6d0fece43d3f992115c4104248b85feb9b (patch) | |
| tree | 029349ded995564ff8214cf34506fcc846784b8d | |
| parent | 3d4d2f2e90464d0c7a9a8b0c531e47367e2bb41b (diff) | |
| download | 4.8-rt-patches-82d52a6d0fece43d3f992115c4104248b85feb9b.tar.gz | |
cgroup: reset back to v4.6.x stable version of patch
| -rw-r--r-- | patches/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch b/patches/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch index 8668cc78e9cf2..c730252d654ed 100644 --- a/patches/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch +++ b/patches/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch @@ -14,16 +14,16 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -5557,10 +5557,10 @@ void mem_cgroup_migrate(struct page *old +@@ -5652,10 +5652,10 @@ void mem_cgroup_migrate(struct page *old commit_charge(newpage, memcg, false); -- local_irq_disable(); -+ local_lock_irq(event_lock); +- local_irq_save(flags); ++ local_lock_irqsave(event_lock, flags); mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages); memcg_check_events(memcg, newpage); -- local_irq_enable(); -+ local_unlock_irq(event_lock); +- local_irq_restore(flags); ++ local_unlock_irqrestore(event_lock, flags); } DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key); |