diff options
| author | Alistair Delva <adelva@google.com> | 2020-12-03 11:43:02 -0800 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-12-03 11:48:17 -0800 |
| commit | 4cb652f2d058eacdfb720e53de0dceaf19ae4587 (patch) | |
| tree | ee2b21834ff21dac0cd41e0c799bc409fd88d0b0 | |
| parent | 72ce9d84b53f69669f7085d298c98fc329a3447e (diff) | |
ANDROID: cuttlefish_defconfig: Disable CONFIG_KSM
This feature is not recommended for Android and causes selinux denials
when running "adb bugreport". Remove it.
Bug: 174771868
Test: launch_cvd
Change-Id: If009c94f3d77d8cb25b2ff845fc47015841de610
Signed-off-by: Alistair Delva <adelva@google.com>
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index ea8a46474d21..e542b2fb35c7 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -45,7 +45,6 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PREEMPT=y CONFIG_HZ_100=y # CONFIG_SPARSEMEM_VMEMMAP is not set -CONFIG_KSM=y CONFIG_ZSMALLOC=y CONFIG_SECCOMP=y CONFIG_ARMV8_DEPRECATED=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index b376f2e5021a..1d06c3c8fbfb 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -48,7 +48,6 @@ CONFIG_PREEMPT=y # CONFIG_MICROCODE is not set CONFIG_X86_MSR=y CONFIG_X86_CPUID=y -CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_MTRR is not set CONFIG_EFI=y |