summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0085-mm-memcontrol-Replace-local_irq_disable-with-local-l.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0085-mm-memcontrol-Replace-local_irq_disable-with-local-l.patch')
-rw-r--r--debian/patches-rt/0085-mm-memcontrol-Replace-local_irq_disable-with-local-l.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0085-mm-memcontrol-Replace-local_irq_disable-with-local-l.patch b/debian/patches-rt/0085-mm-memcontrol-Replace-local_irq_disable-with-local-l.patch
index 056411cab..435b7565c 100644
--- a/debian/patches-rt/0085-mm-memcontrol-Replace-local_irq_disable-with-local-l.patch
+++ b/debian/patches-rt/0085-mm-memcontrol-Replace-local_irq_disable-with-local-l.patch
@@ -1,8 +1,8 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 28 Jan 2015 17:14:16 +0100
-Subject: [PATCH 085/353] mm/memcontrol: Replace local_irq_disable with local
+Subject: [PATCH 085/354] mm/memcontrol: Replace local_irq_disable with local
locks
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=c81a3f5935dfdf459d8a0f1a1a23a8894bff122f
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=b4be6dd731ba2e585304cdd9417cbe93c504c966
There are a few local_irq_disable() which then take sleeping locks. This
patch converts them local locks.
@@ -13,7 +13,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index b828a208f5bd..c6a58923da63 100644
+index e048d50de7aa..9c7d443a394c 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -69,6 +69,7 @@