From: Steven Rostedt (Red Hat) Date: Wed, 26 Feb 2014 15:54:36 +0000 (-0500) Subject: tracepoint: Do not waste memory on mods with no tracepoints X-Git-Tag: v3.2.60~87 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd43c3b3164abc6da4618a373a701be812eb163;p=pandora-kernel.git tracepoint: Do not waste memory on mods with no tracepoints commit 7dec935a3aa04412cba2cebe1524ae0d34a30c24 upstream. No reason to allocate tp_module structures for modules that have no tracepoints. This just wastes memory. Fixes: b75ef8b44b1c "Tracepoint: Dissociate from module mutex" Acked-by: Mathieu Desnoyers Signed-off-by: Steven Rostedt Signed-off-by: Ben Hutchings --- diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 41b25a0ed616..088fbc525ef4 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c @@ -638,6 +638,9 @@ static int tracepoint_module_coming(struct module *mod) struct tp_module *tp_mod, *iter; int ret = 0; + if (!mod->num_tracepoints) + return 0; + /* * We skip modules that taint the kernel, especially those with different * module headers (for forced load), to make sure we don't cause a crash. @@ -681,6 +684,9 @@ static int tracepoint_module_going(struct module *mod) { struct tp_module *pos; + if (!mod->num_tracepoints) + return 0; + mutex_lock(&tracepoints_mutex); tracepoint_update_probe_range(mod->tracepoints_ptrs, mod->tracepoints_ptrs + mod->num_tracepoints);