The patch titled
Subject: dynamic_debug: add static inline stub for ddebug_add_module
has been added to the -mm tree. Its filename is
dynamic_debug-add-static-inline-stub-for-ddebug_add_module.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/dynamic_debug-add-static-inline-stub-for-ddebug_add_module.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/dynamic_debug-add-static-inline-stub-for-ddebug_add_module.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/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Subject: dynamic_debug: add static inline stub for ddebug_add_module
For symmetry with ddebug_remove_module, and to avoid a bit of ifdeffery in
module.c, move the declaration of ddebug_add_module inside #if
defined(CONFIG_DYNAMIC_DEBUG) and add a corresponding no-op stub in the
#else branch.
Link: http://lkml.kernel.org/r/20190212214150.4807-10-linux@xxxxxxxxxxxxxxxxxx
Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Acked-by: Jason Baron <jbaron@xxxxxxxxxx>
Cc: David Sterba <dsterba@xxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxxx>
Cc: "Rafael J . Wysocki" <rafael.j.wysocki@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/dynamic_debug.h | 10 ++++++++--
kernel/module.c | 2 --
2 files changed, 8 insertions(+), 4 deletions(-)
--- a/include/linux/dynamic_debug.h~dynamic_debug-add-static-inline-stub-for-ddebug_add_module
+++ a/include/linux/dynamic_debug.h
@@ -47,10 +47,10 @@ struct _ddebug {
} __attribute__((aligned(8)));
-int ddebug_add_module(struct _ddebug *tab, unsigned int n,
- const char *modname);
#if defined(CONFIG_DYNAMIC_DEBUG)
+int ddebug_add_module(struct _ddebug *tab, unsigned int n,
+ const char *modname);
extern int ddebug_remove_module(const char *mod_name);
extern __printf(2, 3)
void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...);
@@ -152,6 +152,12 @@ do { \
#include <linux/string.h>
#include <linux/errno.h>
+static inline int ddebug_add_module(struct _ddebug *tab, unsigned int n,
+ const char *modname)
+{
+ return 0;
+}
+
static inline int ddebug_remove_module(const char *mod)
{
return 0;
--- a/kernel/module.c~dynamic_debug-add-static-inline-stub-for-ddebug_add_module
+++ a/kernel/module.c
@@ -2719,9 +2719,7 @@ static void dynamic_debug_setup(struct m
{
if (!debug)
return;
-#ifdef CONFIG_DYNAMIC_DEBUG
ddebug_add_module(debug, num, mod->name);
-#endif
}
static void dynamic_debug_remove(struct module *mod, struct _ddebug *debug)
_
Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are
build_bugh-add-wrapper-for-_static_assert.patch
lib-vsprintfc-move-sizeofstruct-printf_spec-next-to-its-definition.patch
linux-fsh-move-member-alignment-check-next-to-definition-of-struct-filename.patch
linux-deviceh-use-dynamic_debug_branch-in-dev_dbg_ratelimited.patch
linux-neth-use-dynamic_debug_branch-in-net_dbg_ratelimited.patch
linux-printkh-use-dynamic_debug_branch-in-pr_debug_ratelimited.patch
dynamic_debug-consolidate-define_dynamic_debug_metadata-definitions.patch
dynamic_debug-dont-duplicate-modname-in-ddebug_add_module.patch
dynamic_debug-use-pointer-comparison-in-ddebug_remove_module.patch
dynamic_debug-remove-unused-export_symbols.patch
dynamic_debug-move-pr_err-from-modulec-to-ddebug_add_module.patch
dynamic_debug-add-static-inline-stub-for-ddebug_add_module.patch
dynamic_debug-refactor-dynamic_pr_debug-and-friends.patch
btrfs-implement-btrfs_debug-in-terms-of-helper-macro.patch
acpi-use-proper-dynamic_debug_branch-macro.patch
acpi-remove-unused-__acpi_handle_debug-macro.patch
acpi-implement-acpi_handle_debug-in-terms-of-_dynamic_func_call.patch
