diff mbox

hexdump: do not print debug dumps for !CONFIG_DEBUG

Message ID 1437551647-19833-1-git-send-email-linus.walleij@linaro.org
State Accepted
Commit cdf17449af1d9b596742c260134edd6c1fac2792
Headers show

Commit Message

Linus Walleij July 22, 2015, 7:54 a.m. UTC
The function print_hex_dump_debug() is likely supposed to be
analogous to pr_debug() or dev_dbg() & friends. Currently it
will adhere to dynamic debug, but will not stub out prints if
CONFIG_DEBUG is not set. Let's make it do the right thing,
because I am tired of having my dmesg buffer full of hex
dumps on production systems.

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Andrew: I think this is your file. I did spend some time
shaking my head thinking this basic thing just can't be wrong,
but it appears it is.
---
 include/linux/printk.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/include/linux/printk.h b/include/linux/printk.h
index a6298b27ac99..2d154b13d6cc 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -456,11 +456,17 @@  static inline void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
 			     groupsize, buf, len, ascii)	\
 	dynamic_hex_dump(prefix_str, prefix_type, rowsize,	\
 			 groupsize, buf, len, ascii)
-#else
+#elif defined(DEBUG)
 #define print_hex_dump_debug(prefix_str, prefix_type, rowsize,		\
 			     groupsize, buf, len, ascii)		\
 	print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, rowsize,	\
 		       groupsize, buf, len, ascii)
-#endif /* defined(CONFIG_DYNAMIC_DEBUG) */
+#else
+static inline void print_hex_dump_debug(const char *prefix_str, int prefix_type,
+					int rowsize, int groupsize,
+					const void *buf, size_t len, bool ascii)
+{
+}
+#endif
 
 #endif