x86 fixes
Subsystems (2)
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
# HEAD: dd3c9c4b603c664fedc12facf180db0f1794aafe x86: Update UV3 hub revision ID
Two fixlets:
- fix a (rare-config) build bug
- fix a next-gen SGI/UV hw/firmware enumeration bug
Thanks,
Ingo
------------------>
Borislav Petkov (1):
x86/microcode: Correct Kconfig dependencies
Russ Anderson (1):
x86: Update UV3 hub revision ID
arch/x86/Kconfig | 1 + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
arch/x86/Kconfig +1 -0
@@ -1033,6 +1033,7 @@ config X86_REBOOTFIXUPS config MICROCODE tristate "CPU microcode loading support" + depends on CPU_SUP_AMD || CPU_SUP_INTEL select FW_LOADER ---help---
arch/x86/kernel/apic/x2apic_uv_x.c +1 -1
@@ -113,7 +113,7 @@ static int __init early_get_pnodeid(void)break ;case UV3_HUB_PART_NUMBER :case UV3_HUB_PART_NUMBER_X : - uv_min_hub_revision_id +=UV3_HUB_REVISION_BASE -1 ; + uv_min_hub_revision_id +=UV3_HUB_REVISION_BASE ;break ; }