projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[deliverable/linux.git]
/
kernel
/
ptrace.c
diff --git
a/kernel/ptrace.c
b/kernel/ptrace.c
index d49bfa1e53e6b4131f1b660b249e12320ad50258..1d3b7665d0be0223343530bcfc940bfa3e525c28 100644
(file)
--- a/
kernel/ptrace.c
+++ b/
kernel/ptrace.c
@@
-585,8
+585,8
@@
static int ptrace_setoptions(struct task_struct *child, unsigned long data)
return -EINVAL;
if (unlikely(data & PTRACE_O_SUSPEND_SECCOMP)) {
return -EINVAL;
if (unlikely(data & PTRACE_O_SUSPEND_SECCOMP)) {
- if (!
config_enabled
(CONFIG_CHECKPOINT_RESTORE) ||
- !
config_enabled
(CONFIG_SECCOMP))
+ if (!
IS_ENABLED
(CONFIG_CHECKPOINT_RESTORE) ||
+ !
IS_ENABLED
(CONFIG_SECCOMP))
return -EINVAL;
if (!capable(CAP_SYS_ADMIN))
return -EINVAL;
if (!capable(CAP_SYS_ADMIN))
This page took
0.024113 seconds
and
5
git commands to generate.