Merge branch 'master' into upstream

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

diff --git a/security/keys/internal.h b/security/keys/internal.h
index e066e6057955d54cd99f431876523fc4742b1d58..1bb416f4bbcef7aa9315e9efcb59d292389ee8b2 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -99,7 +99,9 @@ extern int install_process_keyring(struct task_struct *tsk);
 extern struct key *request_key_and_link(struct key_type *type,
                                        const char *description,
                                        const char *callout_info,
-                                       struct key *dest_keyring);
+                                       void *aux,
+                                       struct key *dest_keyring,
+                                       unsigned long flags);
 
 /*
  * request_key authorisation