From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753463AbbA2GwR (ORCPT ); Thu, 29 Jan 2015 01:52:17 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:59532 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751855AbbA2GwQ (ORCPT ); Thu, 29 Jan 2015 01:52:16 -0500 Date: Thu, 29 Jan 2015 07:52:12 +0100 From: Ingo Molnar To: Borislav Petkov Cc: x86-ml , lkml Subject: Re: [GIT PULL] A microcode loader fix for 3.19 Message-ID: <20150129065212.GA2835@gmail.com> References: <20150128204728.GG7569@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150128204728.GG7569@pd.tnic> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Borislav Petkov 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