diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:37:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:37:52 +0200 |
| commit | 69cb33e2f81a3265383f0c8bbd27c32b4a5a6bf3 (patch) | |
| tree | f7336003d40eb892afcf5e8ec1caeb251b7fd38b /arch/x86/kernel/cpu/microcode/core.c | |
| parent | ec8f353f5262acff120a0dc83b714d899ee94b7f (diff) | |
| parent | 4804f5ad5d63cf7ddad148132a3ecea11410dfa9 (diff) | |
Merge branch 'x86/microcode' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/core.c')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 079f046ee26d..e8021d3e5882 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -696,6 +696,8 @@ static int load_late_locked(void) return load_late_stop_cpus(true); case UCODE_NFOUND: return -ENOENT; + case UCODE_OK: + return 0; default: return -EBADFD; } |