MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-13 20:59:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: fix kernelci build break

Browse Source 
References to vendor data fields need to be inside CONFIG_ANDROID_VENDOR_OEM_DATA

Fixes: 047f3eded8 ("ANDROID: mm: create vendor hooks for memory reclaim")
Bug: 347648912
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I7e470b4335f6da601962908862f4247b2b3f7964
This commit is contained in:
Todd Kjos 2024-06-19 20:56:12 +00:00 committed by Treehugger Robot
parent 3e92cc50b7
commit 3342ce711d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/vmscan.c
View File

@ -6572,8 +6572,10 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,
if (can_reclaim_anon_pages(NULL, pgdat->node_id, sc)) if (can_reclaim_anon_pages(NULL, pgdat->node_id, sc))
inactive_lru_pages += node_page_state(pgdat, NR_INACTIVE_ANON); 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, trace_android_vh_should_continue_reclaim(&sc->android_vendor_data1,
&sc->nr_to_reclaim, &sc->nr_reclaimed, &continue_reclaim); &sc->nr_to_reclaim, &sc->nr_reclaimed, &continue_reclaim);
#endif
if (!continue_reclaim) if (!continue_reclaim)
return false; return false;
@ -6933,9 +6935,11 @@ static void modify_scan_control(struct scan_control *sc)
{ {
bool file_is_tiny = false, may_writepage = true; bool file_is_tiny = false, may_writepage = true;
#ifdef CONFIG_ANDROID_VENDOR_OEM_DATA
trace_android_vh_modify_scan_control(&sc->android_vendor_data1, trace_android_vh_modify_scan_control(&sc->android_vendor_data1,
&sc->nr_to_reclaim, sc->target_mem_cgroup, &file_is_tiny, &sc->nr_to_reclaim, sc->target_mem_cgroup, &file_is_tiny,
&may_writepage); &may_writepage);
#endif
if (file_is_tiny) if (file_is_tiny)
sc->file_is_tiny = true; sc->file_is_tiny = true;