diff options
| author | Dmitry Kasatkin <dmitry.kasatkin@gmail.com> | 2014-10-01 14:43:07 -0400 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-10-07 14:32:53 -0400 |
| commit | d16a8585d3715ef161cc9858b50ea5d3c8b6079b (patch) | |
| tree | d510fb8b2b781fc7aecc347cb229f2531ed9c752 /security/integrity | |
| parent | 0f34a0060aebf202010b3f8fef348653a2df2346 (diff) | |
integrity: add missing '__init' keyword for integrity_init_keyring()
integrity_init_keyring() is used only from kernel '__init'
functions. Add it there as well.
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity')
| -rw-r--r-- | security/integrity/digsig.c | 2 | ||||
| -rw-r--r-- | security/integrity/integrity.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index 8d4fbff8b87c..4f643d1b34dd 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c | |||
| @@ -63,7 +63,7 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, | |||
| 63 | return -EOPNOTSUPP; | 63 | return -EOPNOTSUPP; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | int integrity_init_keyring(const unsigned int id) | 66 | int __init integrity_init_keyring(const unsigned int id) |
| 67 | { | 67 | { |
| 68 | const struct cred *cred = current_cred(); | 68 | const struct cred *cred = current_cred(); |
| 69 | int err = 0; | 69 | int err = 0; |
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index 883a5fc75449..f51ad65c894d 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h | |||
| @@ -129,7 +129,7 @@ struct integrity_iint_cache *integrity_iint_find(struct inode *inode); | |||
| 129 | int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, | 129 | int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, |
| 130 | const char *digest, int digestlen); | 130 | const char *digest, int digestlen); |
| 131 | 131 | ||
| 132 | int integrity_init_keyring(const unsigned int id); | 132 | int __init integrity_init_keyring(const unsigned int id); |
| 133 | #else | 133 | #else |
| 134 | 134 | ||
| 135 | static inline int integrity_digsig_verify(const unsigned int id, | 135 | static inline int integrity_digsig_verify(const unsigned int id, |
