Merge tag 'printk-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

[linux-2.6-block.git] / include / linux / printk.h

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 97aa12c928d45f4aa89e489fa3c866c9a0ee1037..d7c77ed1a4cbf1b8a5ec7d3e986698e368d55666 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -263,7 +263,7 @@ static inline void show_regs_print_info(const char *log_lvl)
 {
 }
 
-static inline asmlinkage void dump_stack(void)
+static inline void dump_stack(void)
 {
 }
 
@@ -460,7 +460,7 @@ do {                                                                        \
                                      DEFAULT_RATELIMIT_INTERVAL,       \
                                      DEFAULT_RATELIMIT_BURST);         \
        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, pr_fmt(fmt));         \
-       if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) &&        \
+       if (DYNAMIC_DEBUG_BRANCH(descriptor) &&                         \
            __ratelimit(&_rs))                                          \
                __dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__);    \
 } while (0)