diff options
| author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-09-03 03:19:58 -0400 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-09-09 10:28:50 -0400 |
| commit | e4a9c5196566bd47ac92f6e5ef7f48412ded7176 (patch) | |
| tree | 14799b5e90f93dd667db46fd56960a47ad066985 | |
| parent | 3a8a2eadc4946ce3af39b3447c32532324538f75 (diff) | |
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>
| -rw-r--r-- | security/integrity/ima/ima.h | 2 | ||||
| -rw-r--r-- | security/integrity/ima/ima_crypto.c | 2 | ||||
| -rw-r--r-- | security/integrity/ima/ima_template.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c6990a723f73..8e4bb883fc13 100644 --- 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); | |||
| 107 | struct ima_template_desc *ima_template_desc_current(void); | 107 | struct ima_template_desc *ima_template_desc_current(void); |
| 108 | int ima_init_template(void); | 108 | int ima_init_template(void); |
| 109 | 109 | ||
| 110 | int ima_init_template(void); | ||
| 111 | |||
| 112 | /* | 110 | /* |
| 113 | * used to protect h_table and sha_table | 111 | * used to protect h_table and sha_table |
| 114 | */ | 112 | */ |
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 3b26472fbf0a..d34e7dfc1118 100644 --- 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, | |||
| 97 | return ret; | 97 | return ret; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | int ima_init_crypto(void) | 100 | int __init ima_init_crypto(void) |
| 101 | { | 101 | { |
| 102 | long rc; | 102 | long rc; |
| 103 | 103 | ||
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c index a076a967ec47..f6826066ff0c 100644 --- a/security/integrity/ima/ima_template.c +++ b/security/integrity/ima/ima_template.c | |||
| @@ -152,7 +152,7 @@ out: | |||
| 152 | return result; | 152 | return result; |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | static int init_defined_templates(void) | 155 | static int __init init_defined_templates(void) |
| 156 | { | 156 | { |
| 157 | int i = 0; | 157 | int i = 0; |
| 158 | int result = 0; | 158 | int result = 0; |
| @@ -178,7 +178,7 @@ struct ima_template_desc *ima_template_desc_current(void) | |||
| 178 | return ima_template; | 178 | return ima_template; |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | int ima_init_template(void) | 181 | int __init ima_init_template(void) |
| 182 | { | 182 | { |
| 183 | int result; | 183 | int result; |
| 184 | 184 | ||
