Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / security / keys / internal.h

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 8c05587f5018b49147bf44ed5f4ad846a173573b..239098f0fd763f846b593de4432f4b887f3fa702 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -78,7 +78,6 @@ extern unsigned key_quota_maxbytes;
 
 extern struct rb_root key_serial_tree;
 extern spinlock_t key_serial_lock;
-extern struct semaphore key_alloc_sem;
 extern struct mutex key_construction_mutex;
 extern wait_queue_head_t request_key_conswq;
 
@@ -108,6 +107,7 @@ extern key_ref_t search_process_keyrings(struct key_type *type,
 
 extern struct key *find_keyring_by_name(const char *name, bool skip_perm_check);
 
+extern int install_user_keyrings(struct task_struct *tsk);
 extern int install_thread_keyring(struct task_struct *tsk);
 extern int install_process_keyring(struct task_struct *tsk);