diff options
author | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/keys/internal.h | |
parent | efb3bb4fad062f8e9b8c9c945d499597e14007e7 (diff) | |
parent | 5806896019ceaa0a1e808182afb4bba33c948ad6 (diff) |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/keys/internal.h')
-rw-r--r-- | security/keys/internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 07a025f81902..f375152a2500 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h | |||
@@ -109,11 +109,13 @@ extern key_ref_t keyring_search_aux(key_ref_t keyring_ref, | |||
109 | const struct cred *cred, | 109 | const struct cred *cred, |
110 | struct key_type *type, | 110 | struct key_type *type, |
111 | const void *description, | 111 | const void *description, |
112 | key_match_func_t match); | 112 | key_match_func_t match, |
113 | bool no_state_check); | ||
113 | 114 | ||
114 | extern key_ref_t search_my_process_keyrings(struct key_type *type, | 115 | extern key_ref_t search_my_process_keyrings(struct key_type *type, |
115 | const void *description, | 116 | const void *description, |
116 | key_match_func_t match, | 117 | key_match_func_t match, |
118 | bool no_state_check, | ||
117 | const struct cred *cred); | 119 | const struct cred *cred); |
118 | extern key_ref_t search_process_keyrings(struct key_type *type, | 120 | extern key_ref_t search_process_keyrings(struct key_type *type, |
119 | const void *description, | 121 | const void *description, |