Commit a9500b1c authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/sfr
parents ac94a58a d3845a62
...@@ -322,7 +322,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer) ...@@ -322,7 +322,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer)
if (task->sighand) { if (task->sighand) {
spin_lock_irq(&task->sighand->siglock); spin_lock_irq(&task->sighand->siglock);
collect_sigign_sigcatch(task, &sigign, &sigcatch); collect_sigign_sigcatch(task, &sigign, &sigcatch);
spin_lock_irq(&task->sighand->siglock); spin_unlock_irq(&task->sighand->siglock);
} }
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
......
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