diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-24 02:44:49 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-23 22:09:19 -0400 |
| commit | 1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (patch) | |
| tree | 8fb48e099710fa179c6ca7dd4c5298513dcd5659 /security/keys | |
| parent | f9369910a6225b8d4892c3f20ae740a711cd5ace (diff) | |
TIF_NOTIFY_RESUME is defined on all targets now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/keys')
| -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 ddb3e05bc5f..534a634283a 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
| @@ -1454,7 +1454,6 @@ long keyctl_get_security(key_serial_t keyid, | |||
| 1454 | */ | 1454 | */ |
| 1455 | long keyctl_session_to_parent(void) | 1455 | long keyctl_session_to_parent(void) |
| 1456 | { | 1456 | { |
| 1457 | #ifdef TIF_NOTIFY_RESUME | ||
| 1458 | struct task_struct *me, *parent; | 1457 | struct task_struct *me, *parent; |
| 1459 | const struct cred *mycred, *pcred; | 1458 | const struct cred *mycred, *pcred; |
| 1460 | struct cred *cred, *oldcred; | 1459 | struct cred *cred, *oldcred; |
| @@ -1542,15 +1541,6 @@ not_permitted: | |||
| 1542 | error_keyring: | 1541 | error_keyring: |
| 1543 | key_ref_put(keyring_r); | 1542 | key_ref_put(keyring_r); |
| 1544 | return ret; | 1543 | return ret; |
| 1545 | |||
| 1546 | #else /* !TIF_NOTIFY_RESUME */ | ||
| 1547 | /* | ||
| 1548 | * To be removed when TIF_NOTIFY_RESUME has been implemented on | ||
| 1549 | * m68k/xtensa | ||
| 1550 | */ | ||
| 1551 | #warning TIF_NOTIFY_RESUME not implemented | ||
| 1552 | return -EOPNOTSUPP; | ||
| 1553 | #endif /* !TIF_NOTIFY_RESUME */ | ||
| 1554 | } | 1544 | } |
| 1555 | 1545 | ||
| 1556 | /* | 1546 | /* |
