The patch titled
Subject: zram-introduce-an-aged-idle-interface-v5-fix
has been removed from the -mm tree. Its filename was
zram-introduce-an-aged-idle-interface-v5-fix.patch
This patch was dropped because it was withdrawn
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: zram-introduce-an-aged-idle-interface-v5-fix
use IS_ENABLED some more
Cc: Brian Geffon <bgeffon@xxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/drivers/block/zram/zram_drv.c~zram-introduce-an-aged-idle-interface-v5-fix
+++ a/drivers/block/zram/zram_drv.c
@@ -309,9 +309,8 @@ static void mark_idle(struct zram *zram,
zram_slot_lock(zram, index);
if (zram_allocated(zram, index) &&
!zram_test_flag(zram, index, ZRAM_UNDER_WB)) {
-#ifdef CONFIG_ZRAM_MEMORY_TRACKING
+ if (IS_ENABLED(CONFIG_ZRAM_MEMORY_TRACKING))
is_idle = (!cutoff || ktime_after(cutoff, zram->table[index].ac_time));
-#endif
if (is_idle)
zram_set_flag(zram, index, ZRAM_IDLE);
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-memory_failure-fix-the-missing-pte_unmap-call-fix.patch
mm.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
ipc-check-checkpoint_restore_ns_capable-to-modify-c-r-proc-files-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
