diff options
| author | Suren Baghdasaryan <surenb@google.com> | 2020-05-05 08:47:39 -0700 |
|---|---|---|
| committer | Suren Baghdasaryan <surenb@google.com> | 2020-06-30 01:26:51 +0000 |
| commit | e1c394899ff15717e0401e496d5a9dd3a9c30ca4 (patch) | |
| tree | b523095374f45df140aae03ab3d69eeb7a5ae18d | |
| parent | 4939cb5d0cb2f88d1ac65322f37fa7db5133e7e9 (diff) | |
| download | kernel_configs-android10-gsi.tar.gz kernel_configs-android10-gsi.tar.bz2 kernel_configs-android10-gsi.zip | |
Remove CONFIG_MEMCG requirement if CONFIG_PSI is presentandroid10-gsi
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
(cherry picked from commit d99837adcbe6f23570771d3d30b074aa8596aaad)
| -rw-r--r-- | q/android-4.14/android-base-conditional.xml | 26 | ||||
| -rw-r--r-- | q/android-4.14/android-base.config | 2 | ||||
| -rw-r--r-- | q/android-4.19/android-base-conditional.xml | 26 | ||||
| -rw-r--r-- | q/android-4.19/android-base.config | 2 |
4 files changed, 52 insertions, 4 deletions
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 cd92b59..a43fa0b 100644 --- a/q/android-4.14/android-base.config +++ b/q/android-4.14/android-base.config @@ -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 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 7efcca5..d127012 100644 --- a/q/android-4.19/android-base.config +++ b/q/android-4.19/android-base.config @@ -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 |