ima: add missing '__init' keywords

Add missing keywords to the function definition to cleanup
to discard initialization code.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Reviewed-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index c6990a723f735e45e9dba60879ea878ddce7dc82..8e4bb883fc13302278cf1f566e3e6a06aca84dfa 100644 (file)
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -107,8 +107,6 @@ void ima_print_digest(struct seq_file *m, u8 *digest, int size);
 struct ima_template_desc *ima_template_desc_current(void);
 int ima_init_template(void);
 
-int ima_init_template(void);
-
 /*
  * used to protect h_table and sha_table
  */

diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
index 3b26472fbf0af69e0995b4bb6f0d0deb4d333dd6..d34e7dfc1118070a5888fd12629e388ee9aeae65 100644 (file)
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
@@ -97,7 +97,7 @@ static int ima_kernel_read(struct file *file, loff_t offset,
        return ret;
 }
 
-int ima_init_crypto(void)
+int __init ima_init_crypto(void)
 {
        long rc;
 

diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index a076a967ec4768f64ebfcd0a84509080e7eb6b18..f6826066ff0c956527b382f5453936afbea8103f 100644 (file)
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -152,7 +152,7 @@ out:
        return result;
 }
 
-static int init_defined_templates(void)
+static int __init init_defined_templates(void)
 {
        int i = 0;
        int result = 0;
@@ -178,7 +178,7 @@ struct ima_template_desc *ima_template_desc_current(void)
        return ima_template;
 }
 
-int ima_init_template(void)
+int __init ima_init_template(void)
 {
        int result;