summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2022-02-14 09:11:26 +0100
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2022-02-14 09:11:26 +0100
commit0f03df5e2368be09650ad277e7ad8c3c6eac13a5 (patch)
tree53625906b2b607fdfa91ac3ad9b5d6d1a0454f7f
parentb8150f7cb443de70d32f91a7a585fc2dd72eb892 (diff)
downloadlinux-rt-0f03df5e2368be09650ad277e7ad8c3c6eac13a5.tar.gz
[ANNOUNCE] v5.17-rc4-rt7v5.17-rc4-rt7-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r--patches/0003-mm-memcg-Add-a-local_lock_t-for-IRQ-and-TASK-object.patch2
-rw-r--r--patches/Add_localversion_for_-RT_release.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/0003-mm-memcg-Add-a-local_lock_t-for-IRQ-and-TASK-object.patch b/patches/0003-mm-memcg-Add-a-local_lock_t-for-IRQ-and-TASK-object.patch
index dc2280807190..142ef97d0e15 100644
--- a/patches/0003-mm-memcg-Add-a-local_lock_t-for-IRQ-and-TASK-object.patch
+++ b/patches/0003-mm-memcg-Add-a-local_lock_t-for-IRQ-and-TASK-object.patch
@@ -75,7 +75,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- obj_cgroup_uncharge_pages(objcg, nr_pages);
+ obj_cgroup_uncharge_pages(objcg, nr_pages, false);
- spin_lock_irqsave(&css_set_lock, flags);
+ spin_lock_irqsave(&objcg_lock, flags);
list_del(&objcg->list);
@@ -2024,26 +2026,40 @@ struct obj_stock {
};
diff --git a/patches/Add_localversion_for_-RT_release.patch b/patches/Add_localversion_for_-RT_release.patch
index 7b3d2414e699..e58a29adc4af 100644
--- a/patches/Add_localversion_for_-RT_release.patch
+++ b/patches/Add_localversion_for_-RT_release.patch
@@ -15,4 +15,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- /dev/null
+++ b/localversion-rt
@@ -0,0 +1 @@
-+-rt6
++-rt7