Remove CONFIG_MEMCG requirement if CONFIG_PSI is present
CONFIG_MEMCG is not required if device enables CONFIG_PSI. Change
CONFIG_MEMCG requirement to a conditional for either CONFIG_MEMCG or
CONFIG_PSI to be enabled. This saves memory resource on devices that
use PSI for memory pressure monitoring.
Bug: 150752949
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: I67bd7aa17d4f939b7eb14a6c91a6f96ef862c80b
Change-Id: I67bd7aa17d4f939b7eb14a6c91a6f96ef862c80b
diff --git a/q/android-4.14/android-base-conditional.xml b/q/android-4.14/android-base-conditional.xml
index 43e534a..bb87ec0 100644
--- a/q/android-4.14/android-base-conditional.xml
+++ b/q/android-4.14/android-base-conditional.xml
@@ -139,6 +139,32 @@
</config>
</group>
+<!-- CONFIG_MEMCG || CONFIG_PSI -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_MEMCG</key>
+ <value type="bool">n</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_PSI</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_PSI</key>
+ <value type="bool">n</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_MEMCG</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
<!-- CONFIG_USB implies CONFIG_USB_RTL8152 -->
<group>
<conditions>
diff --git a/q/android-4.14/android-base.config b/q/android-4.14/android-base.config
index 7ba9d81..cf9b7d5 100644
--- a/q/android-4.14/android-base.config
+++ b/q/android-4.14/android-base.config
@@ -95,8 +95,6 @@
CONFIG_MAGIC_SYSRQ=y
CONFIG_MD=y
CONFIG_MEMBARRIER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
CONFIG_MMU=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
diff --git a/q/android-4.19/android-base-conditional.xml b/q/android-4.19/android-base-conditional.xml
index 265abf0..4f185ef 100644
--- a/q/android-4.19/android-base-conditional.xml
+++ b/q/android-4.19/android-base-conditional.xml
@@ -139,6 +139,32 @@
</config>
</group>
+<!-- CONFIG_MEMCG || CONFIG_PSI -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_MEMCG</key>
+ <value type="bool">n</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_PSI</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_PSI</key>
+ <value type="bool">n</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_MEMCG</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
<!-- CONFIG_USB implies CONFIG_USB_RTL8152 -->
<group>
<conditions>
diff --git a/q/android-4.19/android-base.config b/q/android-4.19/android-base.config
index 79de4de..2f987a9 100644
--- a/q/android-4.19/android-base.config
+++ b/q/android-4.19/android-base.config
@@ -92,8 +92,6 @@
CONFIG_MAGIC_SYSRQ=y
CONFIG_MD=y
CONFIG_MEMBARRIER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
CONFIG_MMU=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
