summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0254-cgroups-use-simple-wait-in-css_release.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0254-cgroups-use-simple-wait-in-css_release.patch')
-rw-r--r--debian/patches-rt/0254-cgroups-use-simple-wait-in-css_release.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0254-cgroups-use-simple-wait-in-css_release.patch b/debian/patches-rt/0254-cgroups-use-simple-wait-in-css_release.patch
index 9cef137b8..fc7b9ac67 100644
--- a/debian/patches-rt/0254-cgroups-use-simple-wait-in-css_release.patch
+++ b/debian/patches-rt/0254-cgroups-use-simple-wait-in-css_release.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 13 Feb 2015 15:52:24 +0100
-Subject: [PATCH 254/353] cgroups: use simple wait in css_release()
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=e78c393381fac00d8163d30d56e9d4161880f64e
+Subject: [PATCH 254/354] cgroups: use simple wait in css_release()
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=eaaf08f8685909a9bcd18431f0ebb9afafaac17b
To avoid:
|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:914
@@ -54,10 +54,10 @@ index 56442d3b651d..1d2275287f0e 100644
/*
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
-index a8185cdb8587..da19cf179b27 100644
+index 6322b56529e9..8df1b3cdfc42 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
-@@ -4787,10 +4787,10 @@ static void css_free_rwork_fn(struct work_struct *work)
+@@ -4801,10 +4801,10 @@ static void css_free_rwork_fn(struct work_struct *work)
}
}
@@ -70,7 +70,7 @@ index a8185cdb8587..da19cf179b27 100644
struct cgroup_subsys *ss = css->ss;
struct cgroup *cgrp = css->cgroup;
-@@ -4852,8 +4852,8 @@ static void css_release(struct percpu_ref *ref)
+@@ -4866,8 +4866,8 @@ static void css_release(struct percpu_ref *ref)
struct cgroup_subsys_state *css =
container_of(ref, struct cgroup_subsys_state, refcnt);
@@ -81,7 +81,7 @@ index a8185cdb8587..da19cf179b27 100644
}
static void init_and_link_css(struct cgroup_subsys_state *css,
-@@ -5573,6 +5573,7 @@ static int __init cgroup_wq_init(void)
+@@ -5587,6 +5587,7 @@ static int __init cgroup_wq_init(void)
*/
cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1);
BUG_ON(!cgroup_destroy_wq);