aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/mcheck/mce.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2017-03-27 11:33:00 +0200
committerIngo Molnar <mingo@kernel.org>2017-03-28 08:54:38 +0200
commitfe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a (patch)
treec575166c95b66df678bddc2f18d0c669bd903779 /arch/x86/kernel/cpu/mcheck/mce.c
parentMerge branch 'ras/urgent' into ras/core, to pick up fix (diff)
downloadlinux-dev-fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a.tar.xz
linux-dev-fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a.zip
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@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/20170327093304.10683-3-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index e95e02734f25..49673b20f17f 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();