summaryrefslogtreecommitdiff
path: root/kernel/pid_namespace.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-06-26 23:52:33 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-06-26 23:52:33 -0400
commitca1579f6c6085ecb1838d9ee052e535682cc0e73 (patch)
tree492bbb19183f84545026f91ecf23957796be8de8 /kernel/pid_namespace.c
parent20dcf8e244b963a5c64cdda336d00d5169d17985 (diff)
parentf73127356f344483c82632accda2e72b7e0e5f25 (diff)
Merge remote-tracking branch 'jl/locks-4.13' into work.misc-set_fs
Diffstat (limited to 'kernel/pid_namespace.c')
-rw-r--r--kernel/pid_namespace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index d1f3e9f558b8..74a5a7255b4d 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -277,7 +277,7 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
* if reparented.
*/
for (;;) {
- set_current_state(TASK_UNINTERRUPTIBLE);
+ set_current_state(TASK_INTERRUPTIBLE);
if (pid_ns->nr_hashed == init_pids)
break;
schedule();