ANDROID: gki_defconfig: reorder some mm config options

Commit 0710d0122a ("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: 0710d0122a ("mm: Kconfig: reorganize misplaced mm options")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic4228bc9498258e0d184daeac482c79253843b83
This commit is contained in:
Greg Kroah-Hartman
2022-06-29 08:33:09 +02:00
parent e2d2ecb4d6
commit ddaec487a3
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -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