diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /security/keys/internal.h | |
| parent | 17e5ad6c0ce5a970e2830d0de8bdd60a2f077d38 (diff) | |
| parent | ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 (diff) | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'security/keys/internal.h')
| -rw-r--r-- | security/keys/internal.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 46c8602661c9..db99ed434f3a 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h | |||
| @@ -71,26 +71,26 @@ extern void keyring_publish_name(struct key *keyring); | |||
| 71 | 71 | ||
| 72 | extern int __key_link(struct key *keyring, struct key *key); | 72 | extern int __key_link(struct key *keyring, struct key *key); |
| 73 | 73 | ||
| 74 | extern struct key *__keyring_search_one(struct key *keyring, | 74 | extern key_ref_t __keyring_search_one(key_ref_t keyring_ref, |
| 75 | const struct key_type *type, | 75 | const struct key_type *type, |
| 76 | const char *description, | 76 | const char *description, |
| 77 | key_perm_t perm); | 77 | key_perm_t perm); |
| 78 | 78 | ||
| 79 | extern struct key *keyring_search_instkey(struct key *keyring, | 79 | extern struct key *keyring_search_instkey(struct key *keyring, |
| 80 | key_serial_t target_id); | 80 | key_serial_t target_id); |
| 81 | 81 | ||
| 82 | typedef int (*key_match_func_t)(const struct key *, const void *); | 82 | typedef int (*key_match_func_t)(const struct key *, const void *); |
| 83 | 83 | ||
| 84 | extern struct key *keyring_search_aux(struct key *keyring, | 84 | extern key_ref_t keyring_search_aux(key_ref_t keyring_ref, |
| 85 | struct task_struct *tsk, | 85 | struct task_struct *tsk, |
| 86 | struct key_type *type, | 86 | struct key_type *type, |
| 87 | const void *description, | 87 | const void *description, |
| 88 | key_match_func_t match); | 88 | key_match_func_t match); |
| 89 | 89 | ||
| 90 | extern struct key *search_process_keyrings(struct key_type *type, | 90 | extern key_ref_t search_process_keyrings(struct key_type *type, |
| 91 | const void *description, | 91 | const void *description, |
| 92 | key_match_func_t match, | 92 | key_match_func_t match, |
| 93 | struct task_struct *tsk); | 93 | struct task_struct *tsk); |
| 94 | 94 | ||
| 95 | extern struct key *find_keyring_by_name(const char *name, key_serial_t bound); | 95 | extern struct key *find_keyring_by_name(const char *name, key_serial_t bound); |
| 96 | 96 | ||