From 3d378c028866642350ac6796f94c46e68247ab85 Mon Sep 17 00:00:00 2001 From: Sergey Senozhatsky Date: Fri, 17 Nov 2023 10:35:20 +0900 Subject: [PATCH] zram-split-memory-tracking-and-ac-time-tracking-v2 ifdef fixup, per Dmytro Link: https://lkml.kernel.org/r/20231117013543.540280-1-senozhatsky@chromium.org Signed-off-by: Sergey Senozhatsky Cc: Dmytro Maluka Cc: Minchan Kim Signed-off-by: Andrew Morton --- drivers/block/zram/Kconfig | 2 +- drivers/block/zram/zram_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 0714184a86ca..af201392ed52 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -74,7 +74,7 @@ config ZRAM_TRACK_ENTRY_ACTIME depends on ZRAM help With this feature zram tracks access time of every stored - entry (page), which can be used for a more fine-grained IDLE + entry (page), which can be used for a more fine grained IDLE pages writeback. config ZRAM_MEMORY_TRACKING diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 68e0a8187783..f6b286e7f310 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -301,7 +301,7 @@ static void mark_idle(struct zram *zram, ktime_t cutoff) zram_slot_lock(zram, index); if (zram_allocated(zram, index) && !zram_test_flag(zram, index, ZRAM_UNDER_WB)) { -#ifdef ZRAM_TRACK_ENTRY_ACTIME +#ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME is_idle = !cutoff || ktime_after(cutoff, zram->table[index].ac_time); #endif -- 2.50.1