| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 2 Dec 2015 15:39:57 +0100
From: Abel Vesa <abelvesa@...ux.com>
To: rostedt@...dmis.org
Cc: linux-kernel@...r.kernel.org, Abel Vesa <abelvesa@...ux.com>
Subject: [PATCH] ftrace: Join functions ftrace_module_init and ftrace_init_module
Simple cleanup. No need for two functions here.
The whole work can simply be done inside 'ftrace_module_init'.
Signed-off-by: Abel Vesa <abelvesa@...ux.com>
---
kernel/trace/ftrace.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index e371aed..f558195 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5008,19 +5008,16 @@ void ftrace_release_mod(struct module *mod)
mutex_unlock(&ftrace_lock);
}
-static void ftrace_init_module(struct module *mod,
- unsigned long *start, unsigned long *end)
+void ftrace_module_init(struct module *mod)
{
+ unsigned long *start = mod->ftrace_callsites;
+ unsigned long *end = mod->ftrace_callsites +
+ mod->num_ftrace_callsites;
+
if (ftrace_disabled || start == end)
return;
- ftrace_process_locs(mod, start, end);
-}
-void ftrace_module_init(struct module *mod)
-{
- ftrace_init_module(mod, mod->ftrace_callsites,
- mod->ftrace_callsites +
- mod->num_ftrace_callsites);
+ ftrace_process_locs(mod, start, end);
}
static int ftrace_module_notify_exit(struct notifier_block *self,
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists