The patch titled Subject: dynamic_debug: only add header when used has been added to the -mm tree. Its filename is dynamic_debug-only-add-header-when-used.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/dynamic_debug-only-add-header-when-used.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/dynamic_debug-only-add-header-when-used.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Luis de Bethencourt <luisbg@xxxxxxxxxxxxxxx> Subject: 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/1468429793-16917-1-git-send-email-luisbg@xxxxxxxxxxxxxxx Signed-off-by: Luis de Bethencourt <luisbg@xxxxxxxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Hidehiro Kawai <hidehiro.kawai.ez@xxxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxx> Cc: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kernel.h | 1 - include/linux/printk.h | 3 ++- kernel/module.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff -puN include/linux/kernel.h~dynamic_debug-only-add-header-when-used include/linux/kernel.h --- a/include/linux/kernel.h~dynamic_debug-only-add-header-when-used +++ a/include/linux/kernel.h @@ -11,7 +11,6 @@ #include <linux/log2.h> #include <linux/typecheck.h> #include <linux/printk.h> -#include <linux/dynamic_debug.h> #include <asm/byteorder.h> #include <uapi/linux/kernel.h> diff -puN include/linux/printk.h~dynamic_debug-only-add-header-when-used include/linux/printk.h --- a/include/linux/printk.h~dynamic_debug-only-add-header-when-used +++ a/include/linux/printk.h @@ -286,10 +286,11 @@ extern asmlinkage void dump_stack(void) no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) #endif -#include <linux/dynamic_debug.h> /* If you are writing a driver, please use dev_dbg instead */ #if defined(CONFIG_DYNAMIC_DEBUG) +#include <linux/dynamic_debug.h> + /* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */ #define pr_debug(fmt, ...) \ dynamic_pr_debug(fmt, ##__VA_ARGS__) diff -puN kernel/module.c~dynamic_debug-only-add-header-when-used kernel/module.c --- a/kernel/module.c~dynamic_debug-only-add-header-when-used +++ a/kernel/module.c @@ -60,6 +60,7 @@ #include <linux/jump_label.h> #include <linux/pfn.h> #include <linux/bsearch.h> +#include <linux/dynamic_debug.h> #include <uapi/linux/module.h> #include "module-internal.h" _ Patches currently in -mm which might be from luisbg@xxxxxxxxxxxxxxx are dynamic_debug-only-add-header-when-used.patch befs-check-return-of-sb_min_blocksize.patch befs-fix-function-name-in-documentation.patch befs-remove-unused-functions.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html