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 <senozhatsky@chromium.org>
Cc: Dmytro Maluka <dmaluka@chromium.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig
index 0714184a86caaa5d9ad9d6ee6bf766c00b4df536..af201392ed52cfd5590474f778c27a155ca5394a 100644 (file)
--- 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 68e0a8187783cbf8ac938f0b83f9067710b95407..f6b286e7f310ea009838d19126d10bf013316adf 100644 (file)
--- 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