From cfe1f5aea680b08668a9cb3d375fa098e163dbf9 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 22 Jun 2021 10:46:17 -0700 Subject: [PATCH] ANDROID: gki_config: disable per-cgroup pressure tracking Disable per-cgroup psi tracking to prevent unnecessary overhead since Android does not use per-cgroup psi information. Bug: 178872719 Bug: 191734423 Signed-off-by: Suren Baghdasaryan Change-Id: Ic6f84630cd478139fb8cce00410163e4e767c86a --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index bebfbf7a3140..4b4acae5e6e2 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -59,7 +59,7 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set -CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected" +CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected cgroup_disable=pressure" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 66d90c85ec3e..c8bf506d767e 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -53,7 +53,7 @@ CONFIG_PARAVIRT=y CONFIG_NR_CPUS=32 CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="stack_depot_disable=on" +CONFIG_CMDLINE="stack_depot_disable=on cgroup_disable=pressure" CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set