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);
 		}