Message ID | 20190617222034.10799-3-linux@rasmusvillemoes.dk |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Series | None | expand |
From: Rasmus Villemoes <linux@rasmusvillemoes.dk> Date: Tue, 18 Jun 2019 00:20:28 +0200 > Changes on x86-64 later in this series require that all struct _ddebug > descriptors in a translation unit uses distinct identifiers. Realize > that for net_dbg_ratelimited by generating such an identifier via > __UNIQUE_ID and pass that to an extra level of macros. > > No functional change. > > Cc: netdev@vger.kernel.org > Acked-by: Jason Baron <jbaron@akamai.com> > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Acked-by: David S. Miller <davem@davemloft.net>
diff --git a/include/linux/net.h b/include/linux/net.h index f7d672cf25b5..a080ede95b47 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -264,7 +264,7 @@ do { \ #define net_info_ratelimited(fmt, ...) \ net_ratelimited_function(pr_info, fmt, ##__VA_ARGS__) #if defined(CONFIG_DYNAMIC_DEBUG) -#define net_dbg_ratelimited(fmt, ...) \ +#define _net_dbg_ratelimited(descriptor, fmt, ...) \ do { \ DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ if (DYNAMIC_DEBUG_BRANCH(descriptor) && \ @@ -272,6 +272,8 @@ do { \ __dynamic_pr_debug(&descriptor, pr_fmt(fmt), \ ##__VA_ARGS__); \ } while (0) +#define net_dbg_ratelimited(fmt, ...) \ + _net_dbg_ratelimited(__UNIQUE_ID(ddebug), fmt, ##__VA_ARGS__) #elif defined(DEBUG) #define net_dbg_ratelimited(fmt, ...) \ net_ratelimited_function(pr_debug, fmt, ##__VA_ARGS__)