From b1d4079dbd6af85e6cb67ab1fd5f91ee08606fec Mon Sep 17 00:00:00 2001
From: Peter Hurley <peter@hurleysoftware.com>
Date: Mon, 15 Apr 2013 11:06:06 -0400
Subject: [PATCH] --- yaml --- r: 364319 b: refs/heads/master c:
 579a00a5c2f0a85fb4602a53e2c1beb77a646528 h: refs/heads/master i:   364317:
 5d71a564ead4229c559a031b3abc27badd28c134   364315:
 e43bf3b125e93d79ae08a4e8aed952ca0e8c3350   364311:
 645630db2b5dd5968f8e9680a85e8f03b20f8e02   364303:
 86da179394ce3737e52763280770b2fba555773c   364287:
 034af96b57df450eb6a8acab04e9850878167a7f v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/tty/tty_ioctl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0e43a0cc4773..b2d48d9ef06f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31815c08fc90f44d6165034fd473f23df5d31449
+refs/heads/master: 579a00a5c2f0a85fb4602a53e2c1beb77a646528
diff --git a/trunk/drivers/tty/tty_ioctl.c b/trunk/drivers/tty/tty_ioctl.c
index d119034877de..3500d4114147 100644
--- a/trunk/drivers/tty/tty_ioctl.c
+++ b/trunk/drivers/tty/tty_ioctl.c
@@ -156,7 +156,7 @@ int tty_throttle_safe(struct tty_struct *tty)
 		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 @@ int tty_unthrottle_safe(struct tty_struct *tty)
 		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);
 		}