Merge commit 'v3.5-rc2' into next

[firefly-linux-kernel-4.4.55.git] / security / keys / internal.h

diff --git a/security/keys/internal.h b/security/keys/internal.h
index f173be2ce3ead7ec3daf169a8e411aca0f94820b..c990b8c8ef1d6946725b0de2ea8deab01d0e787c 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -14,6 +14,7 @@
 
 #include <linux/sched.h>
 #include <linux/key-type.h>
+#include <linux/task_work.h>
 
 #ifdef __KDEBUG
 #define kenter(FMT, ...) \
@@ -148,6 +149,7 @@ extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags,
 #define KEY_LOOKUP_FOR_UNLINK  0x04
 
 extern long join_session_keyring(const char *name);
+extern void key_change_session_keyring(struct task_work *twork);
 
 extern struct work_struct key_gc_work;
 extern unsigned key_gc_delay;