Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37bf863e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.24 into android-3.18 



Changes in 3.18.24:
	Revert "tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c"
	tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c
	Linux 3.18.24

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ef8fb543 b1240304

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 23

SUBLEVEL = 24

EXTRAVERSION =

NAME = Shuffling Zombie Juror

drivers/tty/n_tty.c

+0 −1
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ static void n_tty_packet_mode_flush(struct tty_struct *tty) 
	spin_lock_irqsave(&tty->ctrl_lock, flags);

	if (tty->link->packet) {

		tty->ctrl_status |= TIOCPKT_FLUSHREAD;

		spin_unlock_irqrestore(&tty->ctrl_lock, flags);

		wake_up_interruptible(&tty->link->read_wait);

	}

	spin_unlock_irqrestore(&tty->ctrl_lock, flags);