Commit 6907e374 authored by Kees Cook's avatar Kees Cook Committed by James Morris

LSM: Remove initcall tracing

This partially reverts commit 58eacfff ("init, tracing: instrument
security and console initcall trace events") since security init calls
are about to no longer resemble regular init calls.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Reviewed-by: default avatarJames Morris <james.morris@microsoft.com>
Signed-off-by: default avatarJames Morris <james.morris@microsoft.com>
parent b048ae6e
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <net/flow.h> #include <net/flow.h>
#include <trace/events/initcall.h>
#define MAX_LSM_EVM_XATTR 2 #define MAX_LSM_EVM_XATTR 2
/* Maximum number of letters for an LSM name string */ /* Maximum number of letters for an LSM name string */
...@@ -47,17 +45,13 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = ...@@ -47,17 +45,13 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
static void __init do_security_initcalls(void) static void __init do_security_initcalls(void)
{ {
int ret;
initcall_t call; initcall_t call;
initcall_entry_t *ce; initcall_entry_t *ce;
ce = __start_lsm_info; ce = __start_lsm_info;
trace_initcall_level("security");
while (ce < __end_lsm_info) { while (ce < __end_lsm_info) {
call = initcall_from_entry(ce); call = initcall_from_entry(ce);
trace_initcall_start(call); call();
ret = call();
trace_initcall_finish(call, ret);
ce++; ce++;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment