Commit 88699f8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_microcode_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 microcode loader update from Borislav Petkov:

 - Make CPU vendor dependency explicit against random config build
   failures

* tag 'x86_microcode_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode: Add explicit CPU vendor dependency
parents abc8babe 9c55d99e

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ config MICROCODE 


config MICROCODE_INTEL

	bool "Intel microcode loading support"

	depends on MICROCODE

	depends on CPU_SUP_INTEL && MICROCODE

	default MICROCODE

	help

	  This options enables microcode patch loading support for Intel
@@ -1340,7 +1340,7 @@ config MICROCODE_INTEL 


config MICROCODE_AMD

	bool "AMD microcode loading support"

	depends on MICROCODE

	depends on CPU_SUP_AMD && MICROCODE

	help

	  If you select this option, microcode patch loading support for AMD

	  processors will be enabled.