From 17bdaeea70a33a49d9a9b86a3ddd66d52d84abd8 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Wed, 17 Aug 2011 10:34:33 +1000
Subject: [PATCH] --- yaml --- r: 264516 b: refs/heads/master c:
 4892722e06694fda1928bac4aa5af5505bd26a4c h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/security/integrity/ima/ima.h   | 1 -
 trunk/security/integrity/integrity.h | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 10dce1dd978c..223ed1a83635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc9ff9b7e3eaff3f49bc0fbbddfc1416212e888a
+refs/heads/master: 4892722e06694fda1928bac4aa5af5505bd26a4c
diff --git a/trunk/security/integrity/ima/ima.h b/trunk/security/integrity/ima/ima.h
index 29d97af5e9a4..3ccf7acac6df 100644
--- a/trunk/security/integrity/ima/ima.h
+++ b/trunk/security/integrity/ima/ima.h
@@ -37,7 +37,6 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
 #define IMA_MEASURE_HTABLE_SIZE (1 << IMA_HASH_BITS)
 
 /* set during initialization */
-extern int iint_initialized;
 extern int ima_initialized;
 extern int ima_used_chip;
 extern char *ima_hash;
diff --git a/trunk/security/integrity/integrity.h b/trunk/security/integrity/integrity.h
index 880bbee2f534..3143a3c39868 100644
--- a/trunk/security/integrity/integrity.h
+++ b/trunk/security/integrity/integrity.h
@@ -45,3 +45,6 @@ struct integrity_iint_cache {
  */
 struct integrity_iint_cache *integrity_iint_insert(struct inode *inode);
 struct integrity_iint_cache *integrity_iint_find(struct inode *inode);
+
+/* set during initialization */
+extern int iint_initialized;