diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-12-15 18:26:14 +0100 |
---|---|---|
committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-12-15 18:26:14 +0100 |
commit | 7b59f0e02848b170b021be3ce511c05f6f5e6fac (patch) | |
tree | ef882da81fc9a320b56d6a7e3eeb57dce01a2830 | |
parent | 4330dd3942b5e0fd8f13242d0e7abe198bec63a8 (diff) | |
download | linux-rt-4.14.6-rt6-patches.tar.gz |
[ANNOUNCE] v4.14.6-rt6v4.14.6-rt6-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r-- | patches/localversion.patch | 2 | ||||
-rw-r--r-- | patches/mm-memcontrol-do_not_disable_irq.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/localversion.patch b/patches/localversion.patch index 72cdd2b3c760..4c1841b6475d 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt5 ++-rt6 diff --git a/patches/mm-memcontrol-do_not_disable_irq.patch b/patches/mm-memcontrol-do_not_disable_irq.patch index 9c8a7cce86d3..9cddf870e0b2 100644 --- a/patches/mm-memcontrol-do_not_disable_irq.patch +++ b/patches/mm-memcontrol-do_not_disable_irq.patch @@ -109,7 +109,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> memcg_check_events(memcg, page); if (!mem_cgroup_is_root(memcg)) - css_put(&memcg->css); + css_put_many(&memcg->css, nr_entries); + local_unlock_irqrestore(event_lock, flags); } |