From ddaec487a35090eae88a689a1fbd05f09a523661 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Jun 2022 08:33:09 +0200 Subject: [PATCH] ANDROID: gki_defconfig: reorder some mm config options Commit 0710d0122abc ("mm: Kconfig: reorganize misplaced mm options") reorginized the mm config options a bit, so the gki_defconfig options also need to be reordered so that the build succeeds. Fixes: 0710d0122abc ("mm: Kconfig: reorganize misplaced mm options") Signed-off-by: Greg Kroah-Hartman Change-Id: Ic4228bc9498258e0d184daeac482c79253843b83 --- 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 8d23da6e3c27..c0d28cfd2949 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -40,7 +40,6 @@ CONFIG_BOOT_CONFIG=y CONFIG_KALLSYMS_ALL=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y -# CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_HISI=y @@ -99,6 +98,7 @@ CONFIG_BINFMT_MISC=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y +# CONFIG_COMPAT_BRK is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index aa6c2f982c4a..b59bad7769e6 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -42,7 +42,6 @@ CONFIG_BOOT_CONFIG=y CONFIG_KALLSYMS_ALL=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y -# CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_SMP=y CONFIG_X86_X2APIC=y @@ -84,6 +83,7 @@ CONFIG_BINFMT_MISC=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y +# CONFIG_COMPAT_BRK is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768