Commit a9d4ab7a authored Mar 07, 2019 by Rasmus Villemoes Committed by Linus Torvalds Mar 07, 2019

linux/printk.h: use DYNAMIC_DEBUG_BRANCH in pr_debug_ratelimited

pr_debug_ratelimited tests the dynamic debug descriptor the
old-fashioned way, and doesn't utilize the static key/jump label
implementation when CONFIG_JUMP_LABEL is set.  Use the
DYNAMIC_DEBUG_BRANCH which is defined appropriately.

Link: http://lkml.kernel.org/r/20190212214150.4807-4-linux@rasmusvillemoes.dk


Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Petr Mladek <pmladek@suse.com>
Acked-by: Jason Baron <jbaron@akamai.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: David Sterba <dsterba@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3f16d181

include/linux/printk.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -461,7 +461,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)

Admin message