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

Commit eb0c5377 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: Fix compile error in module tracepoints when MODULE_UNLOAD not set 



If modules are configured in the build but unloading of modules is not,
then the refcnt is not defined. Place the get/put module tracepoints
under CONFIG_MODULE_UNLOAD since it references this field in the module
structure.

As a side-effect, this patch also reduces the code when MODULE_UNLOAD
is not set, because these unused tracepoints are not created.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent ae832d1e

include/trace/events/module.h

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ TRACE_EVENT(module_free, 
	TP_printk("%s", __get_str(name))

);



#ifdef CONFIG_MODULE_UNLOAD

/* trace_module_get/put are only used if CONFIG_MODULE_UNLOAD is defined */



DECLARE_EVENT_CLASS(module_refcnt,



	TP_PROTO(struct module *mod, unsigned long ip),
@@ -86,6 +89,7 @@ DEFINE_EVENT(module_refcnt, module_put, 


	TP_ARGS(mod, ip)

);

#endif /* CONFIG_MODULE_UNLOAD */



TRACE_EVENT(module_request,

kernel/module.c

+3 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/module.h>



EXPORT_TRACEPOINT_SYMBOL(module_get);



#if 0

#define DEBUGP printk

#else
@@ -467,6 +465,9 @@ MODINFO_ATTR(srcversion); 
static char last_unloaded_module[MODULE_NAME_LEN+1];



#ifdef CONFIG_MODULE_UNLOAD



EXPORT_TRACEPOINT_SYMBOL(module_get);



/* Init the unload section of the module. */

static void module_unload_init(struct module *mod)

{