Skip to content

Commit e10821b

Browse files
committed
Merge tag 'x86_build_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 Kconfig fix from Borislav Petkov: - Correct Kconfig symbol visibility on x86 * tag 'x86_build_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/Kconfig: Select ARCH_SELECT_MEMORY_MODEL only if FLATMEM and SPARSEMEM are possible
2 parents 2268735 + 4eda2bc commit e10821b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/x86/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ config ARCH_SPARSEMEM_DEFAULT
16381638

16391639
config ARCH_SELECT_MEMORY_MODEL
16401640
def_bool y
1641-
depends on ARCH_SPARSEMEM_ENABLE
1641+
depends on ARCH_SPARSEMEM_ENABLE && ARCH_FLATMEM_ENABLE
16421642

16431643
config ARCH_MEMORY_PROBE
16441644
bool "Enable sysfs memory/probe interface"

0 commit comments

Comments
 (0)