summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0317-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0317-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch')
-rw-r--r--debian/patches-rt/0317-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0317-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch b/debian/patches-rt/0317-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch
index ff4a95c31..2e7320e2f 100644
--- a/debian/patches-rt/0317-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch
+++ b/debian/patches-rt/0317-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch
@@ -1,8 +1,8 @@
From: Matt Fleming <matt@codeblueprint.co.uk>
Date: Sun, 26 Jan 2020 21:19:45 +0000
-Subject: [PATCH 317/351] mm/memcontrol: Move misplaced
+Subject: [PATCH 317/353] mm/memcontrol: Move misplaced
local_unlock_irqrestore()
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=0e93c1cdf2659fdb41c0c23a64d4560bf76bc4b3
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=337b970c8eb4f7da03deebced8e49ab76004e4da
[ Upstream commit 071a1d6a6e14d0dec240a8c67b425140d7f92f6a ]
@@ -21,10 +21,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 239fec6eac9f..d5bda1449fe3 100644
+index c6a58923da63..692cc519232d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
-@@ -6541,10 +6541,10 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -6552,10 +6552,10 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
mem_cgroup_charge_statistics(memcg, page, PageTransHuge(page),
-nr_entries);
memcg_check_events(memcg, page);