tty: revert incorrectly applied lock patch

I sent GregKH this after the pre-requisites. He dropped the pre-requesites
for good reason and unfortunately then applied this patch. Without this
reverted you get random kernel memory corruption which will make bisecting
anything between it and the properly applied patches a complete sod.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Cox
2012-07-14 15:31:27 +01:00
committed by Greg Kroah-Hartman
parent 467a3ca5ca
commit 6d31a88cb2
14 changed files with 119 additions and 188 deletions

View File

@@ -3336,9 +3336,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
}
DBGINFO(("%s block_til_ready wait\n", tty->driver->name));
tty_unlock(tty);
tty_unlock();
schedule();
tty_lock(tty);
tty_lock();
}
set_current_state(TASK_RUNNING);