TIF_NOTIFY_RESUME is defined on all targets now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 51bd91d..8a2a3fc 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -153,7 +153,6 @@
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 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 ddb3e05..534a634 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1454,7 +1454,6 @@
*/
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 @@
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 */
}
/*