* Borislav Petkov <b...@suse.de> wrote: > Hi guys, > > please pull this last small fix for the microcode loader not erroring > out of its init routine properly. > > Optimally, it should go with the last batch of tip/urgent stuff for > 3.19, if possible. > > Thanks. > > --- > The following changes since commit 26bc420b59a38e4e6685a73345a0def461136dce: > > Linux 3.19-rc6 (2015-01-25 20:04:41 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git > tags/microcode_fix_for_3.19 > > for you to fetch changes up to da63865a01c6384d459464e5165d95d4f04878d8: > > x86, microcode: Return error from driver init code when loader is disabled > (2015-01-28 09:23:40 +0100) > > ---------------------------------------------------------------- > One final fix for 3.19 to address a wrongful deregistering of the > microcode loader module. > > ---------------------------------------------------------------- > Boris Ostrovsky (1): > x86, microcode: Return error from driver init code when loader is > disabled > > arch/x86/kernel/cpu/microcode/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/cpu/microcode/core.c > b/arch/x86/kernel/cpu/microcode/core.c > index 15c29096136b..36a83617eb21 100644 > --- a/arch/x86/kernel/cpu/microcode/core.c > +++ b/arch/x86/kernel/cpu/microcode/core.c > @@ -552,7 +552,7 @@ static int __init microcode_init(void) > int error; > > if (paravirt_enabled() || dis_ucode_ldr) > - return 0; > + return -EINVAL; > > if (c->x86_vendor == X86_VENDOR_INTEL) > microcode_ops = init_intel_microcode();
Pulled into tip:x86/urgent, thanks Boris! Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/