diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 10:14:47 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 10:14:47 +0400 |
| commit | 9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd (patch) | |
| tree | 966b838e2190a7d6868cda5f4eee6d0f490da27c /fs/proc/array.c | |
| parent | e45f265e7ea3ee6de24efe91fe2928d603cb1741 (diff) | |
| parent | 138f296e140f79cb955caba70690076fb14e6f6d (diff) | |
| download | linux-9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd.tar.xz | |
Merge branch '3.10/fb-mmap' into for-next
Merge topic branch to get vm_iomap_memory into use.
Conflicts:
drivers/video/fbmon.c
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index f7ed9ee46eb9..cbd0f1b324b9 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -143,6 +143,7 @@ static const char * const task_state_array[] = { "x (dead)", /* 64 */ "K (wakekill)", /* 128 */ "W (waking)", /* 256 */ + "P (parked)", /* 512 */ }; static inline const char *get_task_state(struct task_struct *tsk) |