Commit 1227dd77 authored by Al Viro's avatar Al Viro

TIF_NOTIFY_RESUME is defined on all targets now

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f9369910
...@@ -153,7 +153,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info, ...@@ -153,7 +153,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
ptrace_notify(SIGTRAP); ptrace_notify(SIGTRAP);
} }
#ifdef TIF_NOTIFY_RESUME
/** /**
* set_notify_resume - cause tracehook_notify_resume() to be called * set_notify_resume - cause tracehook_notify_resume() to be called
* @task: task that will call tracehook_notify_resume() * @task: task that will call tracehook_notify_resume()
...@@ -185,6 +184,5 @@ static inline void set_notify_resume(struct task_struct *task) ...@@ -185,6 +184,5 @@ static inline void set_notify_resume(struct task_struct *task)
static inline void tracehook_notify_resume(struct pt_regs *regs) static inline void tracehook_notify_resume(struct pt_regs *regs)
{ {
} }
#endif /* TIF_NOTIFY_RESUME */
#endif /* <linux/tracehook.h> */ #endif /* <linux/tracehook.h> */
...@@ -1454,7 +1454,6 @@ long keyctl_get_security(key_serial_t keyid, ...@@ -1454,7 +1454,6 @@ long keyctl_get_security(key_serial_t keyid,
*/ */
long keyctl_session_to_parent(void) long keyctl_session_to_parent(void)
{ {
#ifdef TIF_NOTIFY_RESUME
struct task_struct *me, *parent; struct task_struct *me, *parent;
const struct cred *mycred, *pcred; const struct cred *mycred, *pcred;
struct cred *cred, *oldcred; struct cred *cred, *oldcred;
...@@ -1542,15 +1541,6 @@ long keyctl_session_to_parent(void) ...@@ -1542,15 +1541,6 @@ long keyctl_session_to_parent(void)
error_keyring: error_keyring:
key_ref_put(keyring_r); key_ref_put(keyring_r);
return ret; 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 */
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment