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

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
...@@ -1328,7 +1328,7 @@ config MICROCODE ...@@ -1328,7 +1328,7 @@ config MICROCODE
config MICROCODE_INTEL config MICROCODE_INTEL
bool "Intel microcode loading support" bool "Intel microcode loading support"
depends on MICROCODE depends on CPU_SUP_INTEL && MICROCODE
default MICROCODE default MICROCODE
help help
This options enables microcode patch loading support for Intel This options enables microcode patch loading support for Intel
...@@ -1340,7 +1340,7 @@ config MICROCODE_INTEL ...@@ -1340,7 +1340,7 @@ config MICROCODE_INTEL
config MICROCODE_AMD config MICROCODE_AMD
bool "AMD microcode loading support" bool "AMD microcode loading support"
depends on MICROCODE depends on CPU_SUP_AMD && MICROCODE
help help
If you select this option, microcode patch loading support for AMD If you select this option, microcode patch loading support for AMD
processors will be enabled. processors will be enabled.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment