summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-21 18:28:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-21 18:28:13 +0300
commit11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be (patch)
treece03dc406fdb0e7a3d58e6506c1537c9fe9c98d3 /include/linux
parente1d1ea549b57790a3d8cf6300e6ef86118d692a3 (diff)
parent9afe77ed849de6af8532b4c1b9310102eed9edf7 (diff)
downloadlinux-11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk updates from Petr Mladek: - print the warning about dropped messages on consoles on a separate line. It makes it more legible. - one typo fix and small code clean up. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk: added new line symbol after warning about dropped messages printk: fix typo in printk_safe.c printk: simplify no_printk()
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/printk.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 905bba92f015..e9b603ee9953 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -132,10 +132,8 @@ struct va_format {
*/
#define no_printk(fmt, ...) \
({ \
- do { \
- if (0) \
- printk(fmt, ##__VA_ARGS__); \
- } while (0); \
+ if (0) \
+ printk(fmt, ##__VA_ARGS__); \
0; \
})