1 files changed, 4 insertions, 12 deletions

diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 9a0ea4c4e3dd..c7a111cc7d89 100644
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -45,18 +45,12 @@
 #define IMA_MMAP_APPRAISED      0x00000800
 #define IMA_BPRM_APPRAISE       0x00001000
 #define IMA_BPRM_APPRAISED      0x00002000
-#define IMA_MODULE_APPRAISE     0x00004000
-#define IMA_MODULE_APPRAISED    0x00008000
-#define IMA_FIRMWARE_APPRAISE   0x00010000
-#define IMA_FIRMWARE_APPRAISED  0x00020000
-#define IMA_READ_APPRAISE       0x00040000
-#define IMA_READ_APPRAISED      0x00080000
+#define IMA_READ_APPRAISE       0x00004000
+#define IMA_READ_APPRAISED      0x00008000
 #define IMA_APPRAISE_SUBMASK    (IMA_FILE_APPRAISE | IMA_MMAP_APPRAISE | \
-                                 IMA_BPRM_APPRAISE | IMA_MODULE_APPRAISE | \
-                                 IMA_FIRMWARE_APPRAISE | IMA_READ_APPRAISE)
+                                 IMA_BPRM_APPRAISE | IMA_READ_APPRAISE)
 #define IMA_APPRAISED_SUBMASK   (IMA_FILE_APPRAISED | IMA_MMAP_APPRAISED | \
-                                 IMA_BPRM_APPRAISED | IMA_MODULE_APPRAISED | \
-                                 IMA_FIRMWARE_APPRAISED | IMA_READ_APPRAISED)
+                                 IMA_BPRM_APPRAISED | IMA_READ_APPRAISED)
 
 enum evm_ima_xattr_type {
         IMA_XATTR_DIGEST = 0x01,
@@ -111,8 +105,6 @@ struct integrity_iint_cache {
         enum integrity_status ima_file_status:4;
         enum integrity_status ima_mmap_status:4;
         enum integrity_status ima_bprm_status:4;
-        enum integrity_status ima_module_status:4;
-        enum integrity_status ima_firmware_status:4;
         enum integrity_status ima_read_status:4;
         enum integrity_status evm_status:4;
         struct ima_digest_data *ima_hash;