Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9219cec5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 04919afb dd3c9c4b

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

	}