diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 18:32:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 18:32:35 +0200 |
| commit | ca53fb2c7c7da99dc51e6c959c84c9b0aca4e040 (patch) | |
| tree | e80a8f96e65c31b1b5e18665b62eb8e3d5bf3ba9 /arch/x86/Kconfig | |
| parent | Merge tag 'x86_cleanups_for_v5.13' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | x86/build: Disable HIGHMEM64G selection for M486SX (diff) | |
| download | linux-ca53fb2c7c7da99dc51e6c959c84c9b0aca4e040.tar.xz linux-ca53fb2c7c7da99dc51e6c959c84c9b0aca4e040.zip | |
Merge tag 'x86_build_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build updates from Borislav Petkov:
"A bunch of clang build fixes and a Kconfig highmem selection fix for
486SX"
* tag 'x86_build_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/build: Disable HIGHMEM64G selection for M486SX
efi/libstub: Add $(CLANG_FLAGS) to x86 flags
x86/boot: Add $(CLANG_FLAGS) to compressed KBUILD_CFLAGS
x86/build: Propagate $(CLANG_FLAGS) to $(REALMODE_FLAGS)
Diffstat (limited to 'arch/x86/Kconfig')
| -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 489531ed236e..a669e8096c07 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1407,7 +1407,7 @@ config HIGHMEM4G config HIGHMEM64G bool "64GB" - depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6 + depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6 select X86_PAE help Select this if you have a 32-bit processor and more than 4 |