commit 579a00a5c2f0a85fb4602a53e2c1beb77a646528
author Peter Hurley <peter@hurleysoftware.com> Mon Apr 15 11:06:06 2013 -0400
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Mon Apr 15 11:08:12 2013 -0700
tree 7a78af34a407997e0ecc49e0dfbf515587c0ec24
parent 31815c08fc90f44d6165034fd473f23df5d31449

tty: Fix unsafe bit ops in tty_throttle_safe/unthrottle_safe

tty->flags needs to be atomically modified.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/tty/tty_ioctl.c

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index d119034..3500d41 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -156,7 +156,7 @@
 		if (tty->flow_change != TTY_THROTTLE_SAFE)
 			ret = 1;
 		else {
-			__set_bit(TTY_THROTTLED, &tty->flags);
+			set_bit(TTY_THROTTLED, &tty->flags);
 			if (tty->ops->throttle)
 				tty->ops->throttle(tty);
 		}
@@ -187,7 +187,7 @@
 		if (tty->flow_change != TTY_UNTHROTTLE_SAFE)
 			ret = 1;
 		else {
-			__clear_bit(TTY_THROTTLED, &tty->flags);
+			clear_bit(TTY_THROTTLED, &tty->flags);
 			if (tty->ops->unthrottle)
 				tty->ops->unthrottle(tty);
 		}