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 | |
| parent | f9369910a6225b8d4892c3f20ae740a711cd5ace (diff) | |
| download | linux-3.10-1227dd773d8d4e3983b4b751f9ffa0f41402fb7c.tar.gz linux-3.10-1227dd773d8d4e3983b4b751f9ffa0f41402fb7c.tar.bz2 linux-3.10-1227dd773d8d4e3983b4b751f9ffa0f41402fb7c.zip | |
TIF_NOTIFY_RESUME is defined on all targets now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | include/linux/tracehook.h | 2 | ||||
| -rw-r--r-- | security/keys/keyctl.c | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h index 51bd91d911c..8a2a3fc9bd0 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h @@ -153,7 +153,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info, ptrace_notify(SIGTRAP); } -#ifdef TIF_NOTIFY_RESUME /** * set_notify_resume - cause tracehook_notify_resume() to be called * @task: task that will call tracehook_notify_resume() @@ -185,6 +184,5 @@ static inline void set_notify_resume(struct task_struct *task) static inline void tracehook_notify_resume(struct pt_regs *regs) { } -#endif /* TIF_NOTIFY_RESUME */ #endif /* <linux/tracehook.h> */ 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, */ 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 */ } /* |