Merge "Fix format warning in direct reclaim length kill strategy" into main am: 3641d12083 am: e4d7e850a5

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/3101418

Change-Id: Ife40736e38982b79f1c7169cb11826a1179cc642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-06-01 00:43:21 +00:00 committed by Automerger Merge Worker
commit 893827fb61
1 changed files with 1 additions and 2 deletions

View File

@ -3123,8 +3123,7 @@ update_watermarks:
} else if (reclaim == DIRECT_RECLAIM && direct_reclaim_threshold_ms > 0 && } else if (reclaim == DIRECT_RECLAIM && direct_reclaim_threshold_ms > 0 &&
direct_reclaim_duration_ms > direct_reclaim_threshold_ms) { direct_reclaim_duration_ms > direct_reclaim_threshold_ms) {
kill_reason = DIRECT_RECL_STUCK; kill_reason = DIRECT_RECL_STUCK;
snprintf(kill_desc, sizeof(kill_desc), snprintf(kill_desc, sizeof(kill_desc), "device is stuck in direct reclaim (%ldms > %dms)",
"device is stuck in direct reclaim (%" PRId64 "ms > %dms)",
direct_reclaim_duration_ms, direct_reclaim_threshold_ms); direct_reclaim_duration_ms, direct_reclaim_threshold_ms);
} else if (check_filecache) { } else if (check_filecache) {
int64_t file_lru_kb = (vs.field.nr_inactive_file + vs.field.nr_active_file) * page_k; int64_t file_lru_kb = (vs.field.nr_inactive_file + vs.field.nr_active_file) * page_k;