Commit e6a9ee2c authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/net-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents 78170628 2452eef0
...@@ -1666,10 +1666,14 @@ static int get_tid_list(int index, unsigned int *tids, struct inode *dir) ...@@ -1666,10 +1666,14 @@ static int get_tid_list(int index, unsigned int *tids, struct inode *dir)
index -= 2; index -= 2;
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
do { /*
* The starting point task (leader_task) might be an already
* unlinked task, which cannot be used to access the task-list
* via next_thread().
*/
if (pid_alive(task)) do {
int tid = task->pid; int tid = task->pid;
if (!pid_alive(task))
continue;
if (--index >= 0) if (--index >= 0)
continue; continue;
tids[nr_tids] = tid; tids[nr_tids] = tid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment