Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa6788b8 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/microcode: Propagate save_microcode_in_initrd() retval 



Will be used in a later patch. No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1465225850-7352-6-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 852ad5b9

arch/x86/kernel/cpu/microcode/core.c

+3 −3
Original line number Diff line number Diff line
@@ -182,17 +182,17 @@ static int __init save_microcode_in_initrd(void) 
	switch (c->x86_vendor) {

	case X86_VENDOR_INTEL:

		if (c->x86 >= 6)

			save_microcode_in_initrd_intel();

			return save_microcode_in_initrd_intel();

		break;

	case X86_VENDOR_AMD:

		if (c->x86 >= 0x10)

			save_microcode_in_initrd_amd();

			return save_microcode_in_initrd_amd();

		break;

	default:

		break;

	}



	return 0;

	return -EINVAL;

}



void reload_early_microcode(void)

arch/x86/kernel/cpu/microcode/intel.c

+2 −2
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ int __init save_microcode_in_initrd_intel(void) 
	ret = save_microcode(&mc_saved_data, mc_saved, count);

	if (ret)

		pr_err("Cannot save microcode patches from initrd.\n");



	else

		show_saved_mc();



	return ret;