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 signal handler branch
[pandora-kernel.git]
/
security
/
keys
/
compat.c
diff --git
a/security/keys/compat.c
b/security/keys/compat.c
index
3303673
..
bcdb285
100644
(file)
--- a/
security/keys/compat.c
+++ b/
security/keys/compat.c
@@
-74,6
+74,12
@@
asmlinkage long compat_sys_keyctl(u32 option,
case KEYCTL_SET_REQKEY_KEYRING:
return keyctl_set_reqkey_keyring(arg2);
+ case KEYCTL_SET_TIMEOUT:
+ return keyctl_set_timeout(arg2, arg3);
+
+ case KEYCTL_ASSUME_AUTHORITY:
+ return keyctl_assume_authority(arg2);
+
default:
return -EOPNOTSUPP;
}