Skip to content

Commit 88699f8

Browse files
committed
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
2 parents abc8bab + 9c55d99 commit 88699f8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,7 @@ config MICROCODE
13281328

13291329
config MICROCODE_INTEL
13301330
bool "Intel microcode loading support"
1331-
depends on MICROCODE
1331+
depends on CPU_SUP_INTEL && MICROCODE
13321332
default MICROCODE
13331333
help
13341334
This options enables microcode patch loading support for Intel
@@ -1340,7 +1340,7 @@ config MICROCODE_INTEL
13401340

13411341
config MICROCODE_AMD
13421342
bool "AMD microcode loading support"
1343-
depends on MICROCODE
1343+
depends on CPU_SUP_AMD && MICROCODE
13441344
help
13451345
If you select this option, microcode patch loading support for AMD
13461346
processors will be enabled.

0 commit comments

Comments
 (0)