diff options
Diffstat (limited to 'include/linux/key.h')
-rw-r--r-- | include/linux/key.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 8b0bd3393abc..2effd031a817 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
@@ -268,9 +268,6 @@ extern struct key *key_lookup(key_serial_t id); | |||
268 | /* | 268 | /* |
269 | * the userspace interface | 269 | * the userspace interface |
270 | */ | 270 | */ |
271 | extern struct key root_user_keyring, root_session_keyring; | ||
272 | extern int alloc_uid_keyring(struct user_struct *user, | ||
273 | struct task_struct *ctx); | ||
274 | extern void switch_uid_keyring(struct user_struct *new_user); | 271 | extern void switch_uid_keyring(struct user_struct *new_user); |
275 | extern int copy_keys(unsigned long clone_flags, struct task_struct *tsk); | 272 | extern int copy_keys(unsigned long clone_flags, struct task_struct *tsk); |
276 | extern int copy_thread_group_keys(struct task_struct *tsk); | 273 | extern int copy_thread_group_keys(struct task_struct *tsk); |
@@ -299,7 +296,6 @@ extern void key_init(void); | |||
299 | #define make_key_ref(k, p) ({ NULL; }) | 296 | #define make_key_ref(k, p) ({ NULL; }) |
300 | #define key_ref_to_ptr(k) ({ NULL; }) | 297 | #define key_ref_to_ptr(k) ({ NULL; }) |
301 | #define is_key_possessed(k) 0 | 298 | #define is_key_possessed(k) 0 |
302 | #define alloc_uid_keyring(u,c) 0 | ||
303 | #define switch_uid_keyring(u) do { } while(0) | 299 | #define switch_uid_keyring(u) do { } while(0) |
304 | #define __install_session_keyring(t, k) ({ NULL; }) | 300 | #define __install_session_keyring(t, k) ({ NULL; }) |
305 | #define copy_keys(f,t) 0 | 301 | #define copy_keys(f,t) 0 |
@@ -312,10 +308,6 @@ extern void key_init(void); | |||
312 | #define key_fsgid_changed(t) do { } while(0) | 308 | #define key_fsgid_changed(t) do { } while(0) |
313 | #define key_init() do { } while(0) | 309 | #define key_init() do { } while(0) |
314 | 310 | ||
315 | /* Initial keyrings */ | ||
316 | extern struct key root_user_keyring; | ||
317 | extern struct key root_session_keyring; | ||
318 | |||
319 | #endif /* CONFIG_KEYS */ | 311 | #endif /* CONFIG_KEYS */ |
320 | #endif /* __KERNEL__ */ | 312 | #endif /* __KERNEL__ */ |
321 | #endif /* _LINUX_KEY_H */ | 313 | #endif /* _LINUX_KEY_H */ |