diff --git a/[refs] b/[refs]
index 61ae4957198f..07b92e6d0880 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 497f32337073a2da102c49a53779097b5394711b
+refs/heads/master: 15aac676778f206b42c4d7782b08f89246680485
diff --git a/trunk/security/integrity/ima/ima.h b/trunk/security/integrity/ima/ima.h
index 000d13ab1a2d..f7af0110bcde 100644
--- a/trunk/security/integrity/ima/ima.h
+++ b/trunk/security/integrity/ima/ima.h
@@ -96,14 +96,14 @@ static inline unsigned long ima_hash_key(u8 *digest)
 }
 
 /* iint cache flags */
-#define IMA_MEASURED		1
+#define IMA_MEASURED		0x01
 
 /* integrity data associated with an inode */
 struct ima_iint_cache {
 	struct rb_node rb_node; /* rooted in ima_iint_tree */
 	struct inode *inode;	/* back pointer to inode in question */
 	u64 version;		/* track inode changes */
-	unsigned long flags;
+	unsigned char flags;
 	u8 digest[IMA_DIGEST_SIZE];
 	struct mutex mutex;	/* protects: version, flags, digest */
 	unsigned int readcount;	/* measured files readcount */