ima: Remove unused variable ima_initialized
authorPetr Vorel <pvorel@suse.cz>
Thu, 10 May 2018 15:15:48 +0000 (17:15 +0200)
committerMimi Zohar <zohar@linux.vnet.ibm.com>
Thu, 17 May 2018 12:03:06 +0000 (08:03 -0400)
Commit a756024 ("ima: added ima_policy_flag variable") replaced
ima_initialized with ima_policy_flag, but didn't remove ima_initialized.
This patch removes it.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
Reviewed-by: James Morris <james.morris@microsoft.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
security/integrity/ima/ima.h
security/integrity/ima/ima_main.c

index 35fe91aa1fc95ad6001adccbd85fa3856918879f..354bb5716ce329a39e43413a9ed373008c901b1e 100644 (file)
@@ -53,7 +53,6 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
 extern int ima_policy_flag;
 
 /* set during initialization */
-extern int ima_initialized;
 extern int ima_used_chip;
 extern int ima_hash_algo;
 extern int ima_appraise;
index 74d0bd7e76d7159234c036df6c053532f58ab4a4..e771b736aa03e72a23a228ae5c589037a2214b04 100644 (file)
@@ -32,8 +32,6 @@
 
 #include "ima.h"
 
-int ima_initialized;
-
 #ifdef CONFIG_IMA_APPRAISE
 int ima_appraise = IMA_APPRAISE_ENFORCE;
 #else
@@ -517,10 +515,9 @@ static int __init init_ima(void)
                error = ima_init();
        }
 
-       if (!error) {
-               ima_initialized = 1;
+       if (!error)
                ima_update_policy_flag();
-       }
+
        return error;
 }