diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-21 11:25:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-21 11:25:41 -0700 |
| commit | e10821b8a0350530bedcbe725c030ecfe5bd08c2 (patch) | |
| tree | 0c32314199929843dd5351e2a36930a0a697cb0f /arch | |
| parent | 22687350452c80c8e8d2c62d05c1511902c27f42 (diff) | |
| parent | 4eda2bc3431ebe5c8361580877a4666d10ea28a7 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 9f5bd41bf660..391c4cac8958 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1638,7 +1638,7 @@ config ARCH_SPARSEMEM_DEFAULT config ARCH_SELECT_MEMORY_MODEL def_bool y - depends on ARCH_SPARSEMEM_ENABLE + depends on ARCH_SPARSEMEM_ENABLE && ARCH_FLATMEM_ENABLE config ARCH_MEMORY_PROBE bool "Enable sysfs memory/probe interface" |