diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
| commit | e3db1289e7432a882823a7effc474aff78868489 (patch) | |
| tree | 79188812b29602fe3b3641d55c32cfdc2101f0ef /kernel/pid_namespace.c | |
| parent | c316cf670491def52a396d3bdc5a63ad01f7fefa (diff) | |
| parent | 05e97a9eda72d58dba293857df6aac62584ef99a (diff) | |
Merge MTD fixes into -next
Diffstat (limited to 'kernel/pid_namespace.c')
| -rw-r--r-- | kernel/pid_namespace.c | 2 |
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) | |||
| 277 | * if reparented. | 277 | * if reparented. |
| 278 | */ | 278 | */ |
| 279 | for (;;) { | 279 | for (;;) { |
| 280 | set_current_state(TASK_UNINTERRUPTIBLE); | 280 | set_current_state(TASK_INTERRUPTIBLE); |
| 281 | if (pid_ns->nr_hashed == init_pids) | 281 | if (pid_ns->nr_hashed == init_pids) |
| 282 | break; | 282 | break; |
| 283 | schedule(); | 283 | schedule(); |