From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:ras/core] x86/mce: Rename mce_log()'s argument
Date: Tue, 28 Mar 2017 00:01:46 -0700 [thread overview]
Message-ID: <tip-fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a@git.kernel.org> (raw)
In-Reply-To: <20170327093304.10683-3-bp@alien8.de>
Commit-ID: fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a
Gitweb: http://git.kernel.org/tip/fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 27 Mar 2017 11:33:00 +0200
Committer: Ingo Molnar <mingo@kernel.org>
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@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>
---
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();
next prev parent reply other threads:[~2017-03-28 7:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-27 9:32 [PATCH 0/6] x86/RAS: Correctable Errors Collector Borislav Petkov
2017-03-27 9:32 ` [PATCH 1/6] x86/mce: Don't print MCEs when mcelog is active Borislav Petkov
2017-03-28 7:01 ` [tip:ras/core] " tip-bot for Andi Kleen
2017-03-27 9:33 ` [PATCH 2/6] x86/MCE: Rename mce_log()'s argument Borislav Petkov
2017-03-28 7:01 ` tip-bot for Borislav Petkov [this message]
2017-03-27 9:33 ` [PATCH 3/6] x86/MCE: Rename mce_log to mce_log_buffer Borislav Petkov
2017-03-28 7:02 ` [tip:ras/core] x86/mce: " tip-bot for Borislav Petkov
2017-03-27 9:33 ` [PATCH 4/6] RAS: Add a Corrected Errors Collector Borislav Petkov
2017-03-28 7:02 ` [tip:ras/core] " tip-bot for Borislav Petkov
2017-03-27 9:33 ` [PATCH 5/6] x86/mce: Deprecate /dev/mcelog Borislav Petkov
2017-03-28 7:03 ` [tip:ras/core] x86/mce: Factor out and deprecate the /dev/mcelog driver tip-bot for Tony Luck
2017-03-27 9:33 ` [PATCH 6/6] x86/mce: Do not register notifiers with invalid prio Borislav Petkov
2017-03-28 7:04 ` [tip:ras/core] " tip-bot for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-fe3ed20fddfd8c6a4dcfb8e43de80f269d1f3f2a@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox