On Thu 2018-09-20 00:04:27, Rasmus Villemoes wrote:
> pr_debug_ratelimited tests the dynamic debug descriptor the old-fashioned
> way, and doesn't utilize the static key/jump label implementation on
> architectures that HAVE_JUMP_LABEL. Use the DYNAMIC_DEBUG_BRANCH which
> is defined appropriately.
>
> Cc: Petr Mladek <pmla...@suse.com>
> Cc: Steven Rostedt <rost...@goodmis.org>
> Signed-off-by: Rasmus Villemoes <li...@rasmusvillemoes.dk>
Acked-by: Petr Mladek <pmla...@suse.com>
It is an independent fix. I am going to take it via printk.git
unless anyone is against it.
Best Regards,
Petr
> ---
> include/linux/printk.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/printk.h b/include/linux/printk.h
> index cf3eccfe1543..d3ba3245531d 100644
> --- a/include/linux/printk.h
> +++ b/include/linux/printk.h
> @@ -466,7 +466,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)
> --
> 2.16.4
>
