tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
"Two fixlets:

- fix a (rare-config) build bug
- fix a next-gen SGI/UV hw/firmware enumeration bug"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Update UV3 hub revision ID
x86/microcode: Correct Kconfig dependencies

Linus Torvalds 9219cec5 04919afb

options
unified split
Changed files
+2 -1
arch
x86
Kconfig
kernel
apic
x2apic_uv_x.c
+1
arch/x86/Kconfig
··· 1033 1033 1034 1034 config MICROCODE 1035 1035 tristate "CPU microcode loading support" 1036 + depends on CPU_SUP_AMD || CPU_SUP_INTEL 1036 1037 select FW_LOADER 1037 1038 ---help--- 1038 1039
+1 -1
arch/x86/kernel/apic/x2apic_uv_x.c
··· 113 113 break; 114 114 case UV3_HUB_PART_NUMBER: 115 115 case UV3_HUB_PART_NUMBER_X: 116 - uv_min_hub_revision_id += UV3_HUB_REVISION_BASE - 1; 116 + uv_min_hub_revision_id += UV3_HUB_REVISION_BASE; 117 117 break; 118 118 } 119 119