Merge "android R: replace CONFIG_MEMCG requirement with CONFIG_PSI" am: be04f4299c
am: 35fa23d616
am: bea66afd91
Change-Id: I0f12ae583d93f81c48823617a9b94b53deeac05f
This commit is contained in:
commit
000c0c62ee
3 changed files with 3 additions and 6 deletions
|
@ -109,8 +109,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
|
||||
|
@ -198,6 +196,7 @@ CONFIG_PPTP=y
|
|||
CONFIG_PREEMPT=y
|
||||
CONFIG_PROC_FS=y
|
||||
CONFIG_PROFILING=y
|
||||
CONFIG_PSI=y
|
||||
CONFIG_QFMT_V2=y
|
||||
CONFIG_QUOTA=y
|
||||
CONFIG_QUOTACTL=y
|
||||
|
|
|
@ -109,8 +109,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
|
||||
|
@ -196,6 +194,7 @@ CONFIG_PPTP=y
|
|||
CONFIG_PREEMPT=y
|
||||
CONFIG_PROC_FS=y
|
||||
CONFIG_PROFILING=y
|
||||
CONFIG_PSI=y
|
||||
CONFIG_QFMT_V2=y
|
||||
CONFIG_QUOTA=y
|
||||
CONFIG_QUOTACTL=y
|
||||
|
|
|
@ -105,8 +105,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
|
||||
|
@ -192,6 +190,7 @@ CONFIG_PPTP=y
|
|||
CONFIG_PREEMPT=y
|
||||
CONFIG_PROC_FS=y
|
||||
CONFIG_PROFILING=y
|
||||
CONFIG_PSI=y
|
||||
CONFIG_QFMT_V2=y
|
||||
CONFIG_QUOTA=y
|
||||
CONFIG_QUOTACTL=y
|
||||
|
|
Loading…
Reference in a new issue