From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Borislav Petkov <bp@suse.de>,
x86@kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/cpu] x86/cpu/tsx: Define pr_fmt()
Date: Sun, 15 Dec 2019 10:18:19 -0000 [thread overview]
Message-ID: <157640509952.30329.3290134732886823091.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191112221823.19677-2-bp@alien8.de>
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: d157aa0fb241646e8818f699653ed983e6581b11
Gitweb: https://git.kernel.org/tip/d157aa0fb241646e8818f699653ed983e6581b11
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 12 Nov 2019 22:06:03 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Sun, 15 Dec 2019 10:58:54 +01:00
x86/cpu/tsx: Define pr_fmt()
... so that all current and future pr_* statements in this file have the
proper prefix.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20191112221823.19677-2-bp@alien8.de
---
arch/x86/kernel/cpu/tsx.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c
index 3e20d32..1674c8d 100644
--- a/arch/x86/kernel/cpu/tsx.c
+++ b/arch/x86/kernel/cpu/tsx.c
@@ -14,6 +14,9 @@
#include "cpu.h"
+#undef pr_fmt
+#define pr_fmt(fmt) "tsx: " fmt
+
enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
void tsx_disable(void)
@@ -99,7 +102,7 @@ void __init tsx_init(void)
tsx_ctrl_state = x86_get_tsx_auto_mode();
} else {
tsx_ctrl_state = TSX_CTRL_DISABLE;
- pr_err("tsx: invalid option, defaulting to off\n");
+ pr_err("invalid option, defaulting to off\n");
}
} else {
/* tsx= not provided */
next prev parent reply other threads:[~2019-12-15 10:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 22:18 [PATCH 1/2] x86/bugs: Move enum taa_mitigations to bugs.c Borislav Petkov
2019-11-12 22:18 ` [PATCH 2/2] x86/cpu/tsx: Define pr_fmt() Borislav Petkov
2019-12-15 10:18 ` tip-bot2 for Borislav Petkov [this message]
2019-12-15 10:18 ` [tip: x86/cpu] x86/bugs: Move enum taa_mitigations to bugs.c tip-bot2 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=157640509952.30329.3290134732886823091.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®