diff options
| author | Kees Cook <keescook@chromium.org> | 2018-10-10 17:18:20 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-10-10 20:40:21 -0700 |
| commit | 6907e3746fa1b9b685230098266bbeba99b93c7d (patch) | |
| tree | 2bb6f7e2c5d681f3ab19706dbac300dbe972fe5a /security/security.c | |
| parent | b048ae6e6c7062809e4398f4d0bfe80870715d3c (diff) | |
| download | linux-6907e3746fa1b9b685230098266bbeba99b93c7d.tar.gz linux-6907e3746fa1b9b685230098266bbeba99b93c7d.tar.bz2 linux-6907e3746fa1b9b685230098266bbeba99b93c7d.zip | |
LSM: Remove initcall tracing
This partially reverts commit 58eacfffc417 ("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: Kees Cook <keescook@chromium.org>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: James Morris <james.morris@microsoft.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/security/security.c b/security/security.c index 892fe6b691cf..41a5da2c7faf 100644 --- a/security/security.c +++ b/security/security.c @@ -30,8 +30,6 @@ #include <linux/string.h> #include <net/flow.h> -#include <trace/events/initcall.h> - #define MAX_LSM_EVM_XATTR 2 /* Maximum number of letters for an LSM name string */ @@ -47,17 +45,13 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = static void __init do_security_initcalls(void) { - int ret; initcall_t call; initcall_entry_t *ce; ce = __start_lsm_info; - trace_initcall_level("security"); while (ce < __end_lsm_info) { call = initcall_from_entry(ce); - trace_initcall_start(call); - ret = call(); - trace_initcall_finish(call, ret); + call(); ce++; } } |