diff options
Diffstat (limited to 'debian/patches-rt/0002-zram-Remove-ZRAM_LOCK.patch')
| -rw-r--r-- | debian/patches-rt/0002-zram-Remove-ZRAM_LOCK.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/debian/patches-rt/0002-zram-Remove-ZRAM_LOCK.patch b/debian/patches-rt/0002-zram-Remove-ZRAM_LOCK.patch new file mode 100644 index 0000000000..f795579f71 --- /dev/null +++ b/debian/patches-rt/0002-zram-Remove-ZRAM_LOCK.patch @@ -0,0 +1,66 @@ +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Thu, 20 Jun 2024 12:27:11 +0200 +Subject: [PATCH 2/3] zram: Remove ZRAM_LOCK +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.10/older/patches-6.10.2-rt14.tar.xz + +The ZRAM_LOCK was used for locking and after the addition of spinlock_t +the bit set and cleared but there no reader of it. + +Remove the ZRAM_LOCK bit. + +Link: https://lore.kernel.org/r/20240620153556.777272-3-bigeasy@linutronix.de +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + drivers/block/zram/zram_drv.c | 11 ++--------- + drivers/block/zram/zram_drv.h | 4 +--- + 2 files changed, 3 insertions(+), 12 deletions(-) + +--- a/drivers/block/zram/zram_drv.c ++++ b/drivers/block/zram/zram_drv.c +@@ -67,23 +67,16 @@ static void zram_meta_init_table_locks(s + + static int zram_slot_trylock(struct zram *zram, u32 index) + { +- int ret; +- +- ret = spin_trylock(&zram->table[index].lock); +- if (ret) +- __set_bit(ZRAM_LOCK, &zram->table[index].flags); +- return ret; ++ return spin_trylock(&zram->table[index].lock); + } + + static void zram_slot_lock(struct zram *zram, u32 index) + { + spin_lock(&zram->table[index].lock); +- __set_bit(ZRAM_LOCK, &zram->table[index].flags); + } + + static void zram_slot_unlock(struct zram *zram, u32 index) + { +- __clear_bit(ZRAM_LOCK, &zram->table[index].flags); + spin_unlock(&zram->table[index].lock); + } + +@@ -1299,7 +1292,7 @@ static void zram_free_page(struct zram * + zram_set_handle(zram, index, 0); + zram_set_obj_size(zram, index, 0); + WARN_ON_ONCE(zram->table[index].flags & +- ~(1UL << ZRAM_LOCK | 1UL << ZRAM_UNDER_WB)); ++ ~(1UL << ZRAM_UNDER_WB)); + } + + /* +--- a/drivers/block/zram/zram_drv.h ++++ b/drivers/block/zram/zram_drv.h +@@ -45,9 +45,7 @@ + + /* Flags for zram pages (table[page_no].flags) */ + enum zram_pageflags { +- /* zram slot is locked */ +- ZRAM_LOCK = ZRAM_FLAG_SHIFT, +- ZRAM_SAME, /* Page consists the same element */ ++ ZRAM_SAME = ZRAM_FLAG_SHIFT, /* Page consists the same element */ + ZRAM_WB, /* page is stored on backing_device */ + ZRAM_UNDER_WB, /* page is under writeback */ + ZRAM_HUGE, /* Incompressible page */ |