summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-04-24 08:44:49 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-24 04:09:19 +0200
commit1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (patch)
tree8fb48e099710fa179c6ca7dd4c5298513dcd5659
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff)
downloadlinux-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>
-rw-r--r--include/linux/tracehook.h2
-rw-r--r--security/keys/keyctl.c10
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 51bd91d911c3..8a2a3fc9bd05 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 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 */
}
/*