diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
| commit | 10c9850cb2ced2ce528e5b692c639974213a64ec (patch) | |
| tree | f8063beac0ba1dab069d25661845c5b7ef9a67c7 /include/linux/pid.h | |
| parent | 0c2364791343e4b04cd1f097ff2abc2799062448 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pid.h')
| -rw-r--r-- | include/linux/pid.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/pid.h b/include/linux/pid.h index 4d179316e431..719582744a2e 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h | |||
| @@ -8,7 +8,9 @@ enum pid_type | |||
| 8 | PIDTYPE_PID, | 8 | PIDTYPE_PID, |
| 9 | PIDTYPE_PGID, | 9 | PIDTYPE_PGID, |
| 10 | PIDTYPE_SID, | 10 | PIDTYPE_SID, |
| 11 | PIDTYPE_MAX | 11 | PIDTYPE_MAX, |
| 12 | /* only valid to __task_pid_nr_ns() */ | ||
| 13 | __PIDTYPE_TGID | ||
| 12 | }; | 14 | }; |
| 13 | 15 | ||
| 14 | /* | 16 | /* |