diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 09:34:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 09:34:19 -0700 |
| commit | 64a925c9271ec50714b9cea6a9980421ca65f835 (patch) | |
| tree | 15d0f8d4ba996bb0acf5fa4d89a9e8a25752f676 /arch/x86/Kconfig | |
| parent | ca53fb2c7c7da99dc51e6c959c84c9b0aca4e040 (diff) | |
| parent | 27743f01e391ee1d80e3be2a09237507b965f91b (diff) | |
| download | linux-64a925c9271ec50714b9cea6a9980421ca65f835.tar.bz2 | |
Merge tag 'x86_platform_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Borislav Petkov:
"A bunch of SGI UV improvements, fixes and cleanups"
* tag 'x86_platform_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform/uv: Remove dead !CONFIG_KEXEC_CORE code
x86/platform/uv: Fix !KEXEC build failure
x86/platform/uv: Add more to secondary CPU kdump info
x86/platform/uv: Use x2apic enabled bit as set by BIOS to indicate APIC mode
x86/platform/uv: Set section block size for hubless architectures
x86/platform/uv: Fix indentation warning in Documentation/ABI/testing/sysfs-firmware-sgi_uv
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a669e8096c07..6e0b08310949 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -571,6 +571,7 @@ config X86_UV depends on X86_EXTENDED_PLATFORM depends on NUMA depends on EFI + depends on KEXEC_CORE depends on X86_X2APIC depends on PCI help |