git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
security
/
keys
/
internal.h
diff --git
a/security/keys/internal.h
b/security/keys/internal.h
index
e066e60
..
1bb416f
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