The patch titled
Subject: zram-split-memory-tracking-and-ac-time-tracking-v2
has been added to the -mm mm-unstable branch. Its filename is
zram-split-memory-tracking-and-ac-time-tracking-v2.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zram-split-memory-tracking-and-ac-time-tracking-v2.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
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@xxxxxxxxxxxx
Signed-off-by: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
Cc: Dmytro Maluka <dmaluka@xxxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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
_
Patches currently in -mm which might be from senozhatsky@xxxxxxxxxxxx are
zram-split-memory-tracking-and-ac-time-tracking.patch
zram-split-memory-tracking-and-ac-time-tracking-v2.patch
zram-tweak-writeback-config-help.patch
checkpatch-do-not-require-an-empty-line-before-error-injection.patch
