Merge branch 'nfs-for-2.6.32'

[pandora-kernel.git] / security / keys / compat.c

diff --git a/security/keys/compat.c b/security/keys/compat.c
index e10ec99..792c0a6 100644 (file)
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -79,6 +79,12 @@ asmlinkage long compat_sys_keyctl(u32 option,
        case KEYCTL_ASSUME_AUTHORITY:
                return keyctl_assume_authority(arg2);
 
+       case KEYCTL_GET_SECURITY:
+               return keyctl_get_security(arg2, compat_ptr(arg3), arg4);
+
+       case KEYCTL_SESSION_TO_PARENT:
+               return keyctl_session_to_parent();
+
        default:
                return -EOPNOTSUPP;
        }