Skip to content

Commit 97c6f57

Browse files
committed
Merge tag 'x86-alternatives-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/alternatives update from Ingo Molnar: "A single commit that improves the alternatives patching syslog debug output" * tag 'x86-alternatives-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/alternatives: Add pr_fmt() to debug macros
2 parents e4cbce4 + 1b2e335 commit 97c6f57

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kernel/alternative.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ __setup("noreplace-smp", setup_noreplace_smp);
5454
#define DPRINTK(fmt, args...) \
5555
do { \
5656
if (debug_alternative) \
57-
printk(KERN_DEBUG "%s: " fmt "\n", __func__, ##args); \
57+
printk(KERN_DEBUG pr_fmt(fmt) "\n", ##args); \
5858
} while (0)
5959

6060
#define DUMP_BYTES(buf, len, fmt, args...) \
@@ -65,7 +65,7 @@ do { \
6565
if (!(len)) \
6666
break; \
6767
\
68-
printk(KERN_DEBUG fmt, ##args); \
68+
printk(KERN_DEBUG pr_fmt(fmt), ##args); \
6969
for (j = 0; j < (len) - 1; j++) \
7070
printk(KERN_CONT "%02hhx ", buf[j]); \
7171
printk(KERN_CONT "%02hhx\n", buf[j]); \

0 commit comments

Comments
 (0)