From a0cfb5ab27ce470e8f62c0d7159ffd924416d78f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 21 Jun 2022 19:11:01 +0200 Subject: [PATCH] ANDROID: fix up gki_defconfig files due to Kconfig movements Commit 006477f40d2e ("kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt") moved the Kconfig order around a bit, which messed with the checking of the gki_defconfig files by the build system. Also the ZSMALLOC=m requirement went away with commit 6140ae41effe ("zram: fix Kconfig dependency warning") and it is still enabled. Fix all of these up by reordering some of the config options. Fixes: 006477f40d2e ("kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt") Fixes: 6140ae41effe ("zram: fix Kconfig dependency warning") Signed-off-by: Greg Kroah-Hartman Change-Id: Ibd807dae4cc50999838f4471f4f144e6cdb41db1 --- arch/arm64/configs/gki_defconfig | 11 +++++------ arch/x86/configs/gki_defconfig | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index f83e836d57a7..8d23da6e3c27 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -38,14 +38,9 @@ CONFIG_BOOT_CONFIG=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_USERFAULTFD=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB_MERGE_DEFAULT is not set -CONFIG_SLAB_FREELIST_RANDOM=y -CONFIG_SLAB_FREELIST_HARDENED=y -CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_PROFILING=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_HISI=y @@ -100,6 +95,10 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=y +# CONFIG_SLAB_MERGE_DEFAULT is not set +CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y +CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 @@ -108,9 +107,9 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_CMA=y CONFIG_CMA_DEBUGFS=y CONFIG_CMA_AREAS=16 -CONFIG_ZSMALLOC=m # CONFIG_ZONE_DMA is not set CONFIG_ANON_VMA_NAME=y +CONFIG_USERFAULTFD=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index a268cb97aff8..7b79035c7fe2 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -41,14 +41,9 @@ CONFIG_BOOT_CONFIG=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_USERFAULTFD=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB_MERGE_DEFAULT is not set -CONFIG_SLAB_FREELIST_RANDOM=y -CONFIG_SLAB_FREELIST_HARDENED=y -CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_PROFILING=y CONFIG_SMP=y CONFIG_X86_X2APIC=y @@ -86,6 +81,10 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=y +# CONFIG_SLAB_MERGE_DEFAULT is not set +CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y +CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 @@ -96,6 +95,7 @@ CONFIG_CMA_DEBUGFS=y CONFIG_CMA_AREAS=16 # CONFIG_ZONE_DMA is not set CONFIG_ANON_VMA_NAME=y +CONFIG_USERFAULTFD=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y