| From: Sergey Senozhatsky <senozhatsky@chromium.org> |
| Subject: zram-split-memory-tracking-and-ac-time-tracking-v2 |
| Date: Fri, 17 Nov 2023 10:35:20 +0900 |
| |
| 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> |
| --- |
| |
| drivers/block/zram/Kconfig | 2 +- |
| drivers/block/zram/zram_drv.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/block/zram/Kconfig~zram-split-memory-tracking-and-ac-time-tracking-v2 |
| +++ a/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 |
| --- a/drivers/block/zram/zram_drv.c~zram-split-memory-tracking-and-ac-time-tracking-v2 |
| +++ a/drivers/block/zram/zram_drv.c |
| @@ -301,7 +301,7 @@ 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 ZRAM_TRACK_ENTRY_ACTIME |
| +#ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME |
| is_idle = !cutoff || ktime_after(cutoff, |
| zram->table[index].ac_time); |
| #endif |
| _ |
