From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424378AbcFHJya (ORCPT ); Wed, 8 Jun 2016 05:54:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56274 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161910AbcFHJyY (ORCPT ); Wed, 8 Jun 2016 05:54:24 -0400 Date: Wed, 8 Jun 2016 02:53:17 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@suse.de, mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, dvlasenk@redhat.com, luto@amacapital.net, tglx@linutronix.de, bp@alien8.de, brgerst@gmail.com, hpa@zytor.com Reply-To: luto@amacapital.net, dvlasenk@redhat.com, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com, hpa@zytor.com, bp@suse.de, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, torvalds@linux-foundation.org In-Reply-To: <1465225850-7352-5-git-send-email-bp@alien8.de> References: <1465225850-7352-5-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Get rid of find_cpio_data()'s dummy offset arg Git-Commit-ID: 852ad5b94524fd76d49944b9db0a93f7c9ee5814 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: 852ad5b94524fd76d49944b9db0a93f7c9ee5814 Gitweb: http://git.kernel.org/tip/852ad5b94524fd76d49944b9db0a93f7c9ee5814 Author: Borislav Petkov AuthorDate: Mon, 6 Jun 2016 17:10:45 +0200 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 11:04:19 +0200 x86/microcode: Get rid of find_cpio_data()'s dummy offset arg The microcode loader doesn't use it and now that that arg has been made optional in find_cpio_data(), get rid of it here. 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-5-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/microcode/amd.c | 3 +-- arch/x86/kernel/cpu/microcode/intel.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 11dd1cc..b1d1e34 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -64,7 +64,6 @@ static struct cpio_data ucode_cpio; static struct cpio_data __init find_ucode_in_initrd(void) { #ifdef CONFIG_BLK_DEV_INITRD - long offset = 0; char *path; void *start; size_t size; @@ -92,7 +91,7 @@ static struct cpio_data __init find_ucode_in_initrd(void) size = boot_params.hdr.ramdisk_size; #endif /* !CONFIG_X86_32 */ - return find_cpio_data(path, start, size, &offset); + return find_cpio_data(path, start, size, NULL); #else return (struct cpio_data){ NULL, 0, "" }; #endif diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 5835d5b..2ad40b7 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -685,7 +685,6 @@ static __init enum ucode_state __scan_microcode_initrd(struct cpio_data *cd, struct ucode_blobs *blbp) { #ifdef CONFIG_BLK_DEV_INITRD - long offset = 0; static __initdata char ucode_name[] = "kernel/x86/microcode/GenuineIntel.bin"; char *p = IS_ENABLED(CONFIG_X86_32) ? (char *)__pa_nodebug(ucode_name) : ucode_name; @@ -716,7 +715,7 @@ __scan_microcode_initrd(struct cpio_data *cd, struct ucode_blobs *blbp) } # endif - *cd = find_cpio_data(p, (void *)start, size, &offset); + *cd = find_cpio_data(p, (void *)start, size, NULL); if (cd->data) { blbp->start = start; blbp->valid = true;