From 060da33ae44f88671aaf906384baf9f3feaa97b5 Mon Sep 17 00:00:00 2001
From: "T.J. Mercier" <tjmercier@google.com>
Date: Tue, 13 May 2025 17:38:29 +0000
Subject: [PATCH] ANDROID: GKI: Add memcg ABI padding

To facilitate nonspecific potential future backports and fixes.

These structures are allocated from dedicated slabs [1], so there is no
risk of incurring significant memory overhead as a result of these
additions.

[1] https://r.android.com/3623495

Bug: 417480479
Change-Id: I4b1bdbf4edcb857fdf66407d54e8721674e26de4
Signed-off-by: T.J. Mercier <tjmercier@google.com>
---
 include/linux/memcontrol.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index e44ee24d7f00..389865448a1c 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -10,6 +10,7 @@
 
 #ifndef _LINUX_MEMCONTROL_H
 #define _LINUX_MEMCONTROL_H
+#include <linux/android_kabi.h>
 #include <linux/cgroup.h>
 #include <linux/vm_event_item.h>
 #include <linux/hardirq.h>
@@ -113,6 +114,8 @@ struct mem_cgroup_per_node {
 	CACHELINE_PADDING(_pad2_);
 	unsigned long		lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS];
 	struct mem_cgroup_reclaim_iter	iter;
+
+	ANDROID_BACKPORT_RESERVE(1);
 };
 
 struct mem_cgroup_threshold {
@@ -323,6 +326,7 @@ struct mem_cgroup {
 	spinlock_t event_list_lock;
 #endif /* CONFIG_MEMCG_V1 */
 
+	ANDROID_BACKPORT_RESERVE(1);
 	ANDROID_OEM_DATA_ARRAY(1, 2);
 
 	struct mem_cgroup_per_node *nodeinfo[];