This patch corrects calling an __exit function from a non-_-exit function.
signed-off-by: Mimi Zohar <[EMAIL PROTECTED]>
signed-off-by: Kylene Hall <[EMAIL PROTECTED]>
---
security/evm/ima/ima_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.21-rc5-mm2/security/evm/ima/ima_init.c
===================================================================
--- linux-2.6.21-rc5-mm2.orig/security/evm/ima/ima_init.c
+++ linux-2.6.21-rc5-mm2/security/evm/ima/ima_init.c
@@ -111,7 +111,7 @@ int ima_init(void)
return ima_fs_init();
}
-void ima_cleanup(void)
+void __exit ima_cleanup(void)
{
ima_fs_cleanup();
}
Index: linux-2.6.21-rc5-mm2/security/evm/evm_integrity.h
===================================================================
--- linux-2.6.21-rc5-mm2.orig/security/evm/evm_integrity.h
+++ linux-2.6.21-rc5-mm2/security/evm/evm_integrity.h
@@ -9,21 +9,21 @@
extern unsigned int evm_enable_ima;
#ifdef CONFIG_IMA_MEASURE
-static inline int evm_ima_init(void)
+static int evm_ima_init(void)
{
if (evm_enable_ima)
return ima_init();
return 0;
}
-static inline void evm_ima_measure(const unsigned char *name, int hash_len,
+static void evm_ima_measure(const unsigned char *name, int hash_len,
char *hash)
{
if (evm_enable_ima)
ima_measure(name, hash_len, hash);
}
-static inline void evm_ima_cleanup(void)
+static void __exit evm_ima_cleanup(void)
{
if (evm_enable_ima)
ima_cleanup();
@@ -31,19 +31,19 @@ static inline void evm_ima_cleanup(void)
}
#else
-static inline int evm_ima_init(void)
+static int evm_ima_init(void)
{
evm_enable_ima = 0;
return 0;
}
-static inline void evm_ima_measure(const unsigned char *name, int hash_len,
+static void evm_ima_measure(const unsigned char *name, int hash_len,
char *hash)
{
return;
}
-static inline void evm_ima_cleanup(void)
+static void __exit evm_ima_cleanup(void)
{
evm_enable_ima = 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
