Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[firefly-linux-kernel-4.4.55.git] / include / linux / key.h

diff --git a/include/linux/key.h b/include/linux/key.h
index 2393b1c040b695d69d3a2f700300d3b4cec296c5..4dfde1161c5e7878565d05ad7f5293e9e4d19cef 100644 (file)
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -265,6 +265,7 @@ extern int key_unlink(struct key *keyring,
 
 extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid,
                                 const struct cred *cred,
+                                key_perm_t perm,
                                 unsigned long flags,
                                 struct key *dest);