diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 19:40:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 19:40:33 -0700 |
| commit | 88699f8fbfd482167362a881d37156cc3e2b0475 (patch) | |
| tree | 556e28e8e6bf353f3f9dc43522d52316f255e396 | |
| parent | Merge tag 'x86_misc_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/microcode: Add explicit CPU vendor dependency (diff) | |
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
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7fa8bdd0ed7e..038633abf5ab 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -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. |