Skip to content

Commit 1227dd7

Browse files
author
Al Viro
committed
TIF_NOTIFY_RESUME is defined on all targets now
Signed-off-by: Al Viro <[email protected]>
1 parent f936991 commit 1227dd7

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

include/linux/tracehook.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
153153
ptrace_notify(SIGTRAP);
154154
}
155155

156-
#ifdef TIF_NOTIFY_RESUME
157156
/**
158157
* set_notify_resume - cause tracehook_notify_resume() to be called
159158
* @task: task that will call tracehook_notify_resume()
@@ -185,6 +184,5 @@ static inline void set_notify_resume(struct task_struct *task)
185184
static inline void tracehook_notify_resume(struct pt_regs *regs)
186185
{
187186
}
188-
#endif /* TIF_NOTIFY_RESUME */
189187

190188
#endif /* <linux/tracehook.h> */

security/keys/keyctl.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,6 @@ long keyctl_get_security(key_serial_t keyid,
14541454
*/
14551455
long keyctl_session_to_parent(void)
14561456
{
1457-
#ifdef TIF_NOTIFY_RESUME
14581457
struct task_struct *me, *parent;
14591458
const struct cred *mycred, *pcred;
14601459
struct cred *cred, *oldcred;
@@ -1542,15 +1541,6 @@ long keyctl_session_to_parent(void)
15421541
error_keyring:
15431542
key_ref_put(keyring_r);
15441543
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 */
15541544
}
15551545

15561546
/*

0 commit comments

Comments
 (0)