Skip to content

Commit

Permalink
tty: Fix spinlock flavor in non-atomic __tty_hangup()
Browse files Browse the repository at this point in the history
__tty_hangup() and tty_vhangup() cannot be called from atomic context,
so locks do not need to preserve the interrupt state (although,
still disable interrupts).

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 ea648a4 commit 20cc225
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 @@ -605,7 +605,6 @@ static void __tty_hangup(struct tty_struct *tty)
struct file *filp, *f = NULL;
struct tty_file_private *priv;
int closecount = 0, n;
unsigned long flags;
int refs;

if (!tty)
Expand Down Expand Up @@ -654,7 +653,7 @@ static void __tty_hangup(struct tty_struct *tty)
while (refs--)
tty_kref_put(tty);

spin_lock_irqsave(&tty->ctrl_lock, flags);
spin_lock_irq(&tty->ctrl_lock);
clear_bit(TTY_THROTTLED, &tty->flags);
clear_bit(TTY_PUSH, &tty->flags);
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
Expand All @@ -663,7 +662,7 @@ static void __tty_hangup(struct tty_struct *tty)
tty->session = NULL;
tty->pgrp = NULL;
tty->ctrl_status = 0;
spin_unlock_irqrestore(&tty->ctrl_lock, flags);
spin_unlock_irq(&tty->ctrl_lock);

/*
* If one of the devices matches a console pointer, we
Expand Down

0 comments on commit 20cc225

Please sign in to comment.