Messages in this thread | | | Date | Wed, 03 Sep 2014 15:53:42 +0200 | From | Roberto Sassu <> | Subject | Re: [Linux-ima-devel] [PATCH 5/8] ima: add missing '__init' keywords |
| |
On 09/03/2014 09:19 AM, Dmitry Kasatkin wrote: > Add missing keywords to the function definition to cleanup > to discard initialization code. > > Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> > --- > security/integrity/ima/ima.h | 2 -- > security/integrity/ima/ima_crypto.c | 2 +- > 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 c6990a7..8e4bb88 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); > 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 3b26472..d34e7df 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, > 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 a076a96..f682606 100644 > --- 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; >
Hi Dmitry
ok, I'm fine with this change.
Thanks
Roberto Sassu
>
| |