Commit 97c6f57d authored by Linus Torvalds's avatar Linus Torvalds

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
parents e4cbce4d 1b2e335e
...@@ -54,7 +54,7 @@ __setup("noreplace-smp", setup_noreplace_smp); ...@@ -54,7 +54,7 @@ __setup("noreplace-smp", setup_noreplace_smp);
#define DPRINTK(fmt, args...) \ #define DPRINTK(fmt, args...) \
do { \ do { \
if (debug_alternative) \ if (debug_alternative) \
printk(KERN_DEBUG "%s: " fmt "\n", __func__, ##args); \ printk(KERN_DEBUG pr_fmt(fmt) "\n", ##args); \
} while (0) } while (0)
#define DUMP_BYTES(buf, len, fmt, args...) \ #define DUMP_BYTES(buf, len, fmt, args...) \
...@@ -65,7 +65,7 @@ do { \ ...@@ -65,7 +65,7 @@ do { \
if (!(len)) \ if (!(len)) \
break; \ break; \
\ \
printk(KERN_DEBUG fmt, ##args); \ printk(KERN_DEBUG pr_fmt(fmt), ##args); \
for (j = 0; j < (len) - 1; j++) \ for (j = 0; j < (len) - 1; j++) \
printk(KERN_CONT "%02hhx ", buf[j]); \ printk(KERN_CONT "%02hhx ", buf[j]); \
printk(KERN_CONT "%02hhx\n", buf[j]); \ printk(KERN_CONT "%02hhx\n", buf[j]); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment