Skip to content

Commit 9d5059c

Browse files
luisbgtorvalds
authored andcommitted
dynamic_debug: only add header when used
kernel.h header doesn't directly use dynamic debug, instead we can include it in module.c (which used it via kernel.h). printk.h only uses it if CONFIG_DYNAMIC_DEBUG is on, changing the inclusion to only happen in that case. Link: http://lkml.kernel.org/r/[email protected] [[email protected]: include dynamic_debug.h in drb_int.h] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Luis de Bethencourt <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Hidehiro Kawai <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Michal Nazarewicz <[email protected]> Cc: Rasmus Villemoes <[email protected]> Cc: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 61e9649 commit 9d5059c

File tree

5 files changed

+4
-3
lines changed

5 files changed

+4
-3
lines changed

drivers/block/drbd/drbd_actlog.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <linux/crc32c.h>
2828
#include <linux/drbd.h>
2929
#include <linux/drbd_limits.h>
30-
#include <linux/dynamic_debug.h>
3130
#include "drbd_int.h"
3231

3332

drivers/block/drbd/drbd_int.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include <linux/backing-dev.h>
4242
#include <linux/genhd.h>
4343
#include <linux/idr.h>
44+
#include <linux/dynamic_debug.h>
4445
#include <net/tcp.h>
4546
#include <linux/lru_cache.h>
4647
#include <linux/prefetch.h>

include/linux/kernel.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/log2.h>
1212
#include <linux/typecheck.h>
1313
#include <linux/printk.h>
14-
#include <linux/dynamic_debug.h>
1514
#include <asm/byteorder.h>
1615
#include <uapi/linux/kernel.h>
1716

include/linux/printk.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,11 @@ extern asmlinkage void dump_stack(void) __cold;
289289
no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
290290
#endif
291291

292-
#include <linux/dynamic_debug.h>
293292

294293
/* If you are writing a driver, please use dev_dbg instead */
295294
#if defined(CONFIG_DYNAMIC_DEBUG)
295+
#include <linux/dynamic_debug.h>
296+
296297
/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */
297298
#define pr_debug(fmt, ...) \
298299
dynamic_pr_debug(fmt, ##__VA_ARGS__)

kernel/module.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
#include <linux/jump_label.h>
6161
#include <linux/pfn.h>
6262
#include <linux/bsearch.h>
63+
#include <linux/dynamic_debug.h>
6364
#include <uapi/linux/module.h>
6465
#include "module-internal.h"
6566

0 commit comments

Comments
 (0)