Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95247
b: refs/heads/master
c: cb41d6d
h: refs/heads/master
i:
  95245: cf29ba1
  95243: 1d57772
  95239: 2ac1c6c
  95231: 9386f16
v: v3
  • Loading branch information
Pavel Emelyanov authored and Linus Torvalds committed Apr 30, 2008
1 parent 09aba59 commit c8c26d2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b7127aa4547d8cc8a5b569631e2b6ef613af1bb7
refs/heads/master: cb41d6d068716b2b3666925da34d3d7e658bf4f3
6 changes: 3 additions & 3 deletions trunk/kernel/taskstats.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static int fill_pid(pid_t pid, struct task_struct *tsk,

if (!tsk) {
rcu_read_lock();
tsk = find_task_by_pid(pid);
tsk = find_task_by_vpid(pid);
if (tsk)
get_task_struct(tsk);
rcu_read_unlock();
Expand Down Expand Up @@ -230,7 +230,7 @@ static int fill_tgid(pid_t tgid, struct task_struct *first,
*/
rcu_read_lock();
if (!first)
first = find_task_by_pid(tgid);
first = find_task_by_vpid(tgid);

if (!first || !lock_task_sighand(first, &flags))
goto out;
Expand Down Expand Up @@ -547,7 +547,7 @@ void taskstats_exit(struct task_struct *tsk, int group_dead)
if (!stats)
goto err;

rc = fill_pid(tsk->pid, tsk, stats);
rc = fill_pid(-1, tsk, stats);
if (rc < 0)
goto err;

Expand Down

0 comments on commit c8c26d2

Please sign in to comment.