summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/zram-Replace-bit-spinlocks-with-spinlock_t-for-PREEM.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/zram-Replace-bit-spinlocks-with-spinlock_t-for-PREEM.patch')
-rw-r--r--debian/patches-rt/zram-Replace-bit-spinlocks-with-spinlock_t-for-PREEM.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/zram-Replace-bit-spinlocks-with-spinlock_t-for-PREEM.patch b/debian/patches-rt/zram-Replace-bit-spinlocks-with-spinlock_t-for-PREEM.patch
index 0ccb2d87c..497f896e7 100644
--- a/debian/patches-rt/zram-Replace-bit-spinlocks-with-spinlock_t-for-PREEM.patch
+++ b/debian/patches-rt/zram-Replace-bit-spinlocks-with-spinlock_t-for-PREEM.patch
@@ -1,7 +1,7 @@
From: Mike Galbraith <umgwanakikbuti@gmail.com>
Date: Thu, 31 Mar 2016 04:08:28 +0200
Subject: [PATCH] zram: Replace bit spinlocks with spinlock_t for PREEMPT_RT.
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.tar.xz
The bit spinlock disables preemption. The spinlock_t lock becomes a sleeping
lock on PREEMPT_RT and it can not be acquired in this context. In this locked
@@ -72,7 +72,7 @@ Link: https://lore.kernel.org/20230323161830.jFbWCosd@linutronix.de
static inline bool init_done(struct zram *zram)
{
-@@ -1245,6 +1281,7 @@ static bool zram_meta_alloc(struct zram
+@@ -1241,6 +1277,7 @@ static bool zram_meta_alloc(struct zram
if (!huge_class_size)
huge_class_size = zs_huge_class_size(zram->mem_pool);
@@ -89,6 +89,6 @@ Link: https://lore.kernel.org/20230323161830.jFbWCosd@linutronix.de
+#ifdef CONFIG_PREEMPT_RT
+ spinlock_t lock;
+#endif
- #ifdef CONFIG_ZRAM_MEMORY_TRACKING
+ #ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME
ktime_t ac_time;
#endif