Merge tag 'v3.13-rc4' into core/locking

Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 33cfd27b4de2..cee72ce64222 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1667,6 +1667,9 @@ SYSCALL_DEFINE5(keyctl, int, option, unsigned long, arg2, unsigned long, arg3,
         case KEYCTL_INVALIDATE:
                 return keyctl_invalidate_key((key_serial_t) arg2);
 
+        case KEYCTL_GET_PERSISTENT:
+                return keyctl_get_persistent((uid_t)arg2, (key_serial_t)arg3);
+
         default:
                 return -EOPNOTSUPP;
         }