diff options
Diffstat (limited to 'include/linux/dynamic_debug.h')
| -rw-r--r-- | include/linux/dynamic_debug.h | 10 | 
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 0564e3c3988..f71a6b04624 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -28,7 +28,6 @@ struct _ddebug {  #define _DPRINTK_FLAGS_INCL_TID		(1<<4)  #define _DPRINTK_FLAGS_DEFAULT 0  	unsigned int flags:8; -	char enabled;  } __attribute__((aligned(8))); @@ -62,21 +61,20 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor,  		.format = (fmt),				\  		.lineno = __LINE__,				\  		.flags =  _DPRINTK_FLAGS_DEFAULT,		\ -		.enabled = false,				\  	}  #define dynamic_pr_debug(fmt, ...)				\  do {								\  	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);		\ -	if (unlikely(descriptor.enabled))			\ +	if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))	\  		__dynamic_pr_debug(&descriptor, pr_fmt(fmt),	\  				   ##__VA_ARGS__);		\  } while (0)  #define dynamic_dev_dbg(dev, fmt, ...)				\  do {								\ -	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);	\ -	if (unlikely(descriptor.enabled))			\ +	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);		\ +	if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))	\  		__dynamic_dev_dbg(&descriptor, dev, fmt,	\  				  ##__VA_ARGS__);		\  } while (0) @@ -84,7 +82,7 @@ do {								\  #define dynamic_netdev_dbg(dev, fmt, ...)			\  do {								\  	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);		\ -	if (unlikely(descriptor.enabled))			\ +	if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))	\  		__dynamic_netdev_dbg(&descriptor, dev, fmt,	\  				     ##__VA_ARGS__);		\  } while (0)  |