diff options
| -rw-r--r-- | security/integrity/ima/ima.h | 1 | ||||
| -rw-r--r-- | security/integrity/ima/ima_main.c | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 35fe91aa1fc9..354bb5716ce3 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h | |||
| @@ -53,7 +53,6 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 }; | |||
| 53 | extern int ima_policy_flag; | 53 | extern int ima_policy_flag; |
| 54 | 54 | ||
| 55 | /* set during initialization */ | 55 | /* set during initialization */ |
| 56 | extern int ima_initialized; | ||
| 57 | extern int ima_used_chip; | 56 | extern int ima_used_chip; |
| 58 | extern int ima_hash_algo; | 57 | extern int ima_hash_algo; |
| 59 | extern int ima_appraise; | 58 | extern int ima_appraise; |
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 74d0bd7e76d7..e771b736aa03 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c | |||
| @@ -32,8 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include "ima.h" | 33 | #include "ima.h" |
| 34 | 34 | ||
| 35 | int ima_initialized; | ||
| 36 | |||
| 37 | #ifdef CONFIG_IMA_APPRAISE | 35 | #ifdef CONFIG_IMA_APPRAISE |
| 38 | int ima_appraise = IMA_APPRAISE_ENFORCE; | 36 | int ima_appraise = IMA_APPRAISE_ENFORCE; |
| 39 | #else | 37 | #else |
| @@ -517,10 +515,9 @@ static int __init init_ima(void) | |||
| 517 | error = ima_init(); | 515 | error = ima_init(); |
| 518 | } | 516 | } |
| 519 | 517 | ||
| 520 | if (!error) { | 518 | if (!error) |
| 521 | ima_initialized = 1; | ||
| 522 | ima_update_policy_flag(); | 519 | ima_update_policy_flag(); |
| 523 | } | 520 | |
| 524 | return error; | 521 | return error; |
| 525 | } | 522 | } |
| 526 | 523 | ||
