Commit-ID: fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a Gitweb: http://git.kernel.org/tip/fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Mon, 27 Mar 2017 11:33:00 +0200 Committer: Ingo Molnar <mingo@xxxxxxxxxx> 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 <bp@xxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: linux-edac <linux-edac@xxxxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/20170327093304.10683-3-bp@xxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- 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(); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |