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@xxxxxxx>
AuthorDate: Tue, 12 Nov 2019 22:06:03 +01:00
Committer: Borislav Petkov <bp@xxxxxxx>
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@xxxxxxx>
Cc: x86@xxxxxxxxxx
Link: https://lkml.kernel.org/r/20191112221823.19677-2-bp@xxxxxxxxx
---
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 */
|