From 06f890cf6f59ed10cf287b3d391d7c8c591ba1eb Mon Sep 17 00:00:00 2001 From: Xiaojun Ji Date: Fri, 22 Sep 2023 14:27:54 +0800 Subject: [PATCH] Fix KMI break on GKI build Only add OEM DATA on QGKI and keep the origin struct on GKI to avoid break KMI. Change-Id: I6678db4ce211a21c91c5305024cb18b9f5e1265e Reviewed-on: https://gerrit.mot.com/2749363 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- include/linux/memcontrol.h | 3 ++- include/linux/mmzone.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index a56b16cc56f6..528380117ab8 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -333,8 +333,9 @@ struct mem_cgroup { #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_GKI_OPT_FEATURES) struct deferred_split deferred_split_queue; #endif - +#ifdef CONFIG_QGKI ANDROID_OEM_DATA(1); +#endif struct mem_cgroup_per_node *nodeinfo[0]; /* WARNING: nodeinfo must be the last member here */ }; diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index ce7f28658127..3bae2136989a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -758,8 +758,9 @@ typedef struct pglist_data { enum zone_type kswapd_classzone_idx; int kswapd_failures; /* Number of 'reclaimed == 0' runs */ - +#ifdef CONFIG_QGKI ANDROID_OEM_DATA(1); +#endif #ifdef CONFIG_COMPACTION int kcompactd_max_order; enum zone_type kcompactd_classzone_idx;