Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0d85ff9 authored by Cornelia Huck's avatar Cornelia Huck Committed by Greg Kroah-Hartman
Browse files

Make DEBUG take precedence over DYNAMIC_PRINTK_DEBUG 



Statically defined DEBUG should take precedence over
dynamically enabled debugging; otherwise adding DEBUG
(like, for example, via CONFIG_DEBUG_KOBJECT) does not
have the expected result of printing pr_debug() and dev_dbg()
messages unconditionally.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarJason Baron <jbaron@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b9daa99e

include/linux/device.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -553,13 +553,13 @@ extern const char *dev_driver_string(const struct device *dev); 
#define dev_info(dev, format, arg...)		\

#define dev_info(dev, format, arg...)		\

	dev_printk(KERN_INFO , dev , format , ## arg)

	dev_printk(KERN_INFO , dev , format , ## arg)





#if defined(CONFIG_DYNAMIC_PRINTK_DEBUG)

#if defined(DEBUG)

#define dev_dbg(dev, format, arg...)		\

	dev_printk(KERN_DEBUG , dev , format , ## arg)

#elif defined(CONFIG_DYNAMIC_PRINTK_DEBUG)

#define dev_dbg(dev, format, ...) do { \

#define dev_dbg(dev, format, ...) do { \

	dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \

	dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \

	} while (0)

	} while (0)

#elif defined(DEBUG)

#define dev_dbg(dev, format, arg...)		\

	dev_printk(KERN_DEBUG , dev , format , ## arg)

#else

#else

#define dev_dbg(dev, format, arg...)		\

#define dev_dbg(dev, format, arg...)		\

	({ if (0) dev_printk(KERN_DEBUG, dev, format, ##arg); 0; })

	({ if (0) dev_printk(KERN_DEBUG, dev, format, ##arg); 0; })

include/linux/kernel.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -349,13 +349,13 @@ static inline char *pack_hex_byte(char *buf, u8 byte) 
        printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)

        printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)





/* If you are writing a driver, please use dev_dbg instead */

/* If you are writing a driver, please use dev_dbg instead */

#if defined(CONFIG_DYNAMIC_PRINTK_DEBUG)

#if defined(DEBUG)

#define pr_debug(fmt, ...) \

	printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)

#elif defined(CONFIG_DYNAMIC_PRINTK_DEBUG)

#define pr_debug(fmt, ...) do { \

#define pr_debug(fmt, ...) do { \

	dynamic_pr_debug(pr_fmt(fmt), ##__VA_ARGS__); \

	dynamic_pr_debug(pr_fmt(fmt), ##__VA_ARGS__); \

	} while (0)

	} while (0)

#elif defined(DEBUG)

#define pr_debug(fmt, ...) \

	printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)

#else

#else

#define pr_debug(fmt, ...) \

#define pr_debug(fmt, ...) \

	({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })

	({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })