Skip to content

Commit

Permalink
Merge tag 'x86-alternatives-2020-08-03' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/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
  • Loading branch information
torvalds committed Aug 3, 2020
2 parents e4cbce4 + 1b2e335 commit 97c6f57
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/kernel/alternative.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ __setup("noreplace-smp", setup_noreplace_smp);
#define DPRINTK(fmt, args...) \
do { \
if (debug_alternative) \
printk(KERN_DEBUG "%s: " fmt "\n", __func__, ##args); \
printk(KERN_DEBUG pr_fmt(fmt) "\n", ##args); \
} while (0)

#define DUMP_BYTES(buf, len, fmt, args...) \
Expand All @@ -65,7 +65,7 @@ do { \
if (!(len)) \
break; \
\
printk(KERN_DEBUG fmt, ##args); \
printk(KERN_DEBUG pr_fmt(fmt), ##args); \
for (j = 0; j < (len) - 1; j++) \
printk(KERN_CONT "%02hhx ", buf[j]); \
printk(KERN_CONT "%02hhx\n", buf[j]); \
Expand Down

0 comments on commit 97c6f57

Please sign in to comment.