diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-24 08:44:49 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-24 04:09:19 +0200 |
| commit | 1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (patch) | |
| tree | 8fb48e099710fa179c6ca7dd4c5298513dcd5659 /security | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-1227dd773d8d4e3983b4b751f9ffa0f41402fb7c.tar.xz linux-1227dd773d8d4e3983b4b751f9ffa0f41402fb7c.zip | |
TIF_NOTIFY_RESUME is defined on all targets now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/keyctl.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index ddb3e05bc5fc..534a634283a4 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1454,7 +1454,6 @@ long keyctl_get_security(key_serial_t keyid, */ long keyctl_session_to_parent(void) { -#ifdef TIF_NOTIFY_RESUME struct task_struct *me, *parent; const struct cred *mycred, *pcred; struct cred *cred, *oldcred; @@ -1542,15 +1541,6 @@ not_permitted: error_keyring: key_ref_put(keyring_r); return ret; - -#else /* !TIF_NOTIFY_RESUME */ - /* - * To be removed when TIF_NOTIFY_RESUME has been implemented on - * m68k/xtensa - */ -#warning TIF_NOTIFY_RESUME not implemented - return -EOPNOTSUPP; -#endif /* !TIF_NOTIFY_RESUME */ } /* |