Skip to content

Commit

Permalink
tty: Use spin_lock() inside existing critical region
Browse files Browse the repository at this point in the history
The interrupt state does not need to be saved, disabled and
restored here; interrupts are already off because this lock
is bracketed by spin_lock_irq/spin_unlock_irq.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Acked-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peter Hurley authored and Greg Kroah-Hartman committed Mar 15, 2013
1 parent 20cc225 commit bc30c3b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/tty/tty_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@ EXPORT_SYMBOL_GPL(tty_wakeup);
static int tty_signal_session_leader(struct tty_struct *tty)
{
struct task_struct *p;
unsigned long flags;
int refs = 0;

read_lock(&tasklist_lock);
Expand All @@ -565,10 +564,10 @@ static int tty_signal_session_leader(struct tty_struct *tty)
__group_send_sig_info(SIGHUP, SEND_SIG_PRIV, p);
__group_send_sig_info(SIGCONT, SEND_SIG_PRIV, p);
put_pid(p->signal->tty_old_pgrp); /* A noop */
spin_lock_irqsave(&tty->ctrl_lock, flags);
spin_lock(&tty->ctrl_lock);
if (tty->pgrp)
p->signal->tty_old_pgrp = get_pid(tty->pgrp);
spin_unlock_irqrestore(&tty->ctrl_lock, flags);
spin_unlock(&tty->ctrl_lock);
spin_unlock_irq(&p->sighand->siglock);
} while_each_pid_task(tty->session, PIDTYPE_SID, p);
}
Expand Down

0 comments on commit bc30c3b

Please sign in to comment.