From d645236cfd5ebbdf687571212bb7e78c23cc4c1b Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 9 Jun 2023 17:50:44 +0000 Subject: [PATCH] ANDROID: fix kernelci build failure in vmscan.c Vendor hooks added in vmscan.c directly referenced a vendor-specific field which is only defined if CONFIG_ANDROID_VENDOR_OEM_DATA is enabled. A kernelci config wich CONFIG_ANDROID_VENDOR_OEM_DATA disabled and CONFIG_ANDROID_VENDOR_HOOKS enabled has a build-break due to the undefined field. Fixes: 3e2dc32f5930 ("ANDROID: mm: create vendor hooks for memory reclaim") Change-Id: Id7d31af9cf5752eba5ba27c5d31a288230f29114 Signed-off-by: Todd Kjos --- mm/vmscan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/vmscan.c b/mm/vmscan.c index 7c1d07b3e7f5..cd4323f336a6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6349,8 +6349,10 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat, if (can_reclaim_anon_pages(NULL, pgdat->node_id, sc)) inactive_lru_pages += node_page_state(pgdat, NR_INACTIVE_ANON); +#ifdef CONFIG_ANDROID_VENDOR_OEM_DATA trace_android_vh_should_continue_reclaim(&sc->android_vendor_data1, &sc->nr_to_reclaim, &sc->nr_reclaimed, &continue_reclaim); +#endif if (!continue_reclaim) return false; @@ -6712,9 +6714,11 @@ static void modify_scan_control(struct scan_control *sc) { bool file_is_tiny = false, may_writepage = true; +#ifdef CONFIG_ANDROID_VENDOR_OEM_DATA trace_android_vh_modify_scan_control(&sc->android_vendor_data1, &sc->nr_to_reclaim, sc->target_mem_cgroup, &file_is_tiny, &may_writepage); +#endif if (file_is_tiny) sc->file_is_tiny = true;