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
This commit is contained in:
Suren Baghdasaryan 2020-05-05 08:47:39 -07:00
parent 2e0a0c526c
commit d99837adcb
4 changed files with 52 additions and 4 deletions

View file

@ -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>

View file

@ -95,8 +95,6 @@ CONFIG_L2TP=y
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

View file

@ -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>

View file

@ -92,8 +92,6 @@ CONFIG_L2TP=y
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