From 579a00a5c2f0a85fb4602a53e2c1beb77a646528 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Mon, 15 Apr 2013 11:06:06 -0400 Subject: tty: Fix unsafe bit ops in tty_throttle_safe/unthrottle_safe tty->flags needs to be atomically modified. Signed-off-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- drivers/tty/tty_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/tty/tty_ioctl.c') diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index d119034877de..3500d4114147 100644 --- a/drivers/tty/tty_ioctl.c +++ b/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); } -- cgit v1.2.3