summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0002-cgroup-Consolidate-users-of-cgroup_rstat_lock.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0002-cgroup-Consolidate-users-of-cgroup_rstat_lock.patch')
-rw-r--r--debian/patches-rt/0002-cgroup-Consolidate-users-of-cgroup_rstat_lock.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/debian/patches-rt/0002-cgroup-Consolidate-users-of-cgroup_rstat_lock.patch b/debian/patches-rt/0002-cgroup-Consolidate-users-of-cgroup_rstat_lock.patch
new file mode 100644
index 000000000..9ca443ca1
--- /dev/null
+++ b/debian/patches-rt/0002-cgroup-Consolidate-users-of-cgroup_rstat_lock.patch
@@ -0,0 +1,69 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 16 Aug 2019 12:20:42 +0200
+Subject: [PATCH 2/4] cgroup: Consolidate users of cgroup_rstat_lock.
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz
+
+cgroup_rstat_flush_irqsafe() has no users, remove it.
+cgroup_rstat_flush_hold() and cgroup_rstat_flush_release() are only used within
+this file. Make it static.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/cgroup.h | 3 ---
+ kernel/cgroup/rstat.c | 19 ++-----------------
+ 2 files changed, 2 insertions(+), 20 deletions(-)
+
+--- a/include/linux/cgroup.h
++++ b/include/linux/cgroup.h
+@@ -750,9 +750,6 @@ static inline void cgroup_path_from_kern
+ */
+ void cgroup_rstat_updated(struct cgroup *cgrp, int cpu);
+ void cgroup_rstat_flush(struct cgroup *cgrp);
+-void cgroup_rstat_flush_irqsafe(struct cgroup *cgrp);
+-void cgroup_rstat_flush_hold(struct cgroup *cgrp);
+-void cgroup_rstat_flush_release(void);
+
+ /*
+ * Basic resource stats.
+--- a/kernel/cgroup/rstat.c
++++ b/kernel/cgroup/rstat.c
+@@ -201,21 +201,6 @@ void cgroup_rstat_flush(struct cgroup *c
+ }
+
+ /**
+- * cgroup_rstat_flush_irqsafe - irqsafe version of cgroup_rstat_flush()
+- * @cgrp: target cgroup
+- *
+- * This function can be called from any context.
+- */
+-void cgroup_rstat_flush_irqsafe(struct cgroup *cgrp)
+-{
+- unsigned long flags;
+-
+- spin_lock_irqsave(&cgroup_rstat_lock, flags);
+- cgroup_rstat_flush_locked(cgrp, false);
+- spin_unlock_irqrestore(&cgroup_rstat_lock, flags);
+-}
+-
+-/**
+ * cgroup_rstat_flush_begin - flush stats in @cgrp's subtree and hold
+ * @cgrp: target cgroup
+ *
+@@ -224,7 +209,7 @@ void cgroup_rstat_flush_irqsafe(struct c
+ *
+ * This function may block.
+ */
+-void cgroup_rstat_flush_hold(struct cgroup *cgrp)
++static void cgroup_rstat_flush_hold(struct cgroup *cgrp)
+ __acquires(&cgroup_rstat_lock)
+ {
+ might_sleep();
+@@ -235,7 +220,7 @@ void cgroup_rstat_flush_hold(struct cgro
+ /**
+ * cgroup_rstat_flush_release - release cgroup_rstat_flush_hold()
+ */
+-void cgroup_rstat_flush_release(void)
++static void cgroup_rstat_flush_release(void)
+ __releases(&cgroup_rstat_lock)
+ {
+ spin_unlock_irq(&cgroup_rstat_lock);