Commit 3e3122a7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge greg@deskfan:linux/BK/class-2.5

into kroah.com:/home/greg/linux/BK/class-2.5
parents cc7218d8 b36c92e7
...@@ -1146,6 +1146,7 @@ int ...@@ -1146,6 +1146,7 @@ int
send_sig_info(int sig, struct siginfo *info, struct task_struct *p) send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
{ {
int ret; int ret;
unsigned long flags;
/* /*
* We need the tasklist lock even for the specific * We need the tasklist lock even for the specific
...@@ -1154,9 +1155,9 @@ send_sig_info(int sig, struct siginfo *info, struct task_struct *p) ...@@ -1154,9 +1155,9 @@ send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
* going away or changing from under us. * going away or changing from under us.
*/ */
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
spin_lock_irq(&p->sighand->siglock); spin_lock_irqsave(&p->sighand->siglock, flags);
ret = specific_send_sig_info(sig, info, p); ret = specific_send_sig_info(sig, info, p);
spin_unlock_irq(&p->sighand->siglock); spin_unlock_irqrestore(&p->sighand->siglock, flags);
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
return ret; return ret;
} }
......
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