From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424411AbcFHJyn (ORCPT ); Wed, 8 Jun 2016 05:54:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56300 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423385AbcFHJyk (ORCPT ); Wed, 8 Jun 2016 05:54:40 -0400 Date: Wed, 8 Jun 2016 02:53:44 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: dvlasenk@redhat.com, torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, brgerst@gmail.com, luto@amacapital.net, bp@suse.de, bp@alien8.de, peterz@infradead.org Reply-To: dvlasenk@redhat.com, torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, brgerst@gmail.com, luto@amacapital.net, bp@alien8.de, bp@suse.de, peterz@infradead.org In-Reply-To: <1465225850-7352-6-git-send-email-bp@alien8.de> References: <1465225850-7352-6-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Propagate save_microcode_in_initrd() retval Git-Commit-ID: fa6788b8c681ffe0a1bf9f99dddc2c447069241c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fa6788b8c681ffe0a1bf9f99dddc2c447069241c Gitweb: http://git.kernel.org/tip/fa6788b8c681ffe0a1bf9f99dddc2c447069241c Author: Borislav Petkov AuthorDate: Mon, 6 Jun 2016 17:10:46 +0200 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 11:04:20 +0200 x86/microcode: Propagate save_microcode_in_initrd() retval Will be used in a later patch. No functionality change. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1465225850-7352-6-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/microcode/core.c | 6 +++--- arch/x86/kernel/cpu/microcode/intel.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 12823b6..9ae7fca 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -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) diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 2ad40b7..d852ca9 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -675,8 +675,8 @@ 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"); - - show_saved_mc(); + else + show_saved_mc(); return ret; }