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>

diff --git a/security/security.c b/security/security.c
index 892fe6b691cf883834a21c51033cec7a260548ef..41a5da2c7fafc03a5fbf9d9a021f6c90d12b8955 100644 (file)
--- 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++;
        }
 }