diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-08 17:22:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-08 17:22:02 -0800 |
| commit | 42c371f8ec4296cee49b10d8e6be50aae90f2d70 (patch) | |
| tree | ed6ef90323c430ed77063b9f9c622a8a550ee85d /arch/x86/Kconfig | |
| parent | f73857ece4d85d2ee36571df9c13a733f3ba2732 (diff) | |
| parent | bcf7ef56daca2eacf836d22eee23c66f7cd96a65 (diff) | |
Merge tag 'x86-build-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build updates from Ingo Molnar:
- Update the objdump & instruction decoder self-test code for better
LLVM toolchain compatibility
- Rework CONFIG_X86_PAE dependencies, for better readability and higher
robustness.
- Misc cleanups
* tag 'x86-build-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tools: objdump_reformat.awk: Skip bad instructions from llvm-objdump
x86/Kconfig: Rework CONFIG_X86_PAE dependency
x86/tools: Remove chkobjdump.awk
x86/tools: objdump_reformat.awk: Allow for spaces
x86/tools: objdump_reformat.awk: Ensure regex matches fwait
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1566748f16c4..d3a43efac2d5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1415,7 +1415,7 @@ config HIGHMEM4G config HIGHMEM64G bool "64GB" - depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !MWINCHIP3D && !MK6 + depends on X86_HAVE_PAE select X86_PAE help Select this if you have a 32-bit processor and more than 4 @@ -1472,7 +1472,7 @@ config HIGHMEM config X86_PAE bool "PAE (Physical Address Extension) Support" - depends on X86_32 && !HIGHMEM4G + depends on X86_32 && X86_HAVE_PAE select PHYS_ADDR_T_64BIT select SWIOTLB help |