From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754599AbdC1HFX (ORCPT ); Tue, 28 Mar 2017 03:05:23 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48785 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754508AbdC1HFV (ORCPT ); Tue, 28 Mar 2017 03:05:21 -0400 Date: Tue, 28 Mar 2017 00:01:46 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, bp@suse.de, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org Reply-To: bp@suse.de, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com In-Reply-To: <20170327093304.10683-3-bp@alien8.de> References: <20170327093304.10683-3-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Rename mce_log()'s argument Git-Commit-ID: fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a 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: fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a Gitweb: http://git.kernel.org/tip/fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a Author: Borislav Petkov AuthorDate: Mon, 27 Mar 2017 11:33:00 +0200 Committer: Ingo Molnar CommitDate: Tue, 28 Mar 2017 08:54:38 +0200 x86/mce: Rename mce_log()'s argument We call it everywhere "struct mce *m". Adjust that here too to avoid confusion. No functionality change. Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-edac Link: http://lkml.kernel.org/r/20170327093304.10683-3-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/mcheck/mce.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index e95e027..49673b2 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -158,14 +158,14 @@ static struct mce_log mcelog = { .recordlen = sizeof(struct mce), }; -void mce_log(struct mce *mce) +void mce_log(struct mce *m) { unsigned next, entry; /* Emit the trace record: */ - trace_mce_record(mce); + trace_mce_record(m); - if (!mce_gen_pool_add(mce)) + if (!mce_gen_pool_add(m)) irq_work_queue(&mce_irq_work); wmb(); @@ -195,7 +195,7 @@ void mce_log(struct mce *mce) if (cmpxchg(&mcelog.next, entry, next) == entry) break; } - memcpy(mcelog.entry + entry, mce, sizeof(struct mce)); + memcpy(mcelog.entry + entry, m, sizeof(struct mce)); wmb(); mcelog.entry[entry].finished = 1; wmb();