diff options
| author | David Howells <dhowells@redhat.com> | 2014-09-16 18:32:55 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-09-16 18:32:55 +0200 |
| commit | 1c9c115ccc76d313f1a9232ffb903de325b64943 (patch) | |
| tree | a0e106355ed4f401be0a33fb115dc675f54a3766 /security/keys | |
| parent | Merge tag 'keys-fixes-20140916' into keys-next (diff) | |
| parent | PKCS#7: Add a missing static (diff) | |
| download | linux-1c9c115ccc76d313f1a9232ffb903de325b64943.tar.xz linux-1c9c115ccc76d313f1a9232ffb903de325b64943.zip | |
Merge tag 'keys-next-fixes-20140916' into keys-next
Merge in keyrings fixes for next:
(1) Insert some missing 'static' annotations.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/request_key_auth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 842e6f410d50..739e7455d388 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -44,12 +44,12 @@ struct key_type key_type_request_key_auth = { .read = request_key_auth_read, }; -int request_key_auth_preparse(struct key_preparsed_payload *prep) +static int request_key_auth_preparse(struct key_preparsed_payload *prep) { return 0; } -void request_key_auth_free_preparse(struct key_preparsed_payload *prep) +static void request_key_auth_free_preparse(struct key_preparsed_payload *prep) { } |