|
@@ -2703,23 +2703,17 @@ static int tty_tiocgicount(struct tty_struct *tty, void __user *arg)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-struct tty_struct *tty_pair_get_tty(struct tty_struct *tty)
|
|
|
|
|
|
+/*
|
|
|
|
+ * if pty, return the slave side (real_tty)
|
|
|
|
+ * otherwise, return self
|
|
|
|
+ */
|
|
|
|
+static struct tty_struct *tty_pair_get_tty(struct tty_struct *tty)
|
|
{
|
|
{
|
|
if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
|
|
if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
|
|
tty->driver->subtype == PTY_TYPE_MASTER)
|
|
tty->driver->subtype == PTY_TYPE_MASTER)
|
|
tty = tty->link;
|
|
tty = tty->link;
|
|
return tty;
|
|
return tty;
|
|
}
|
|
}
|
|
-EXPORT_SYMBOL(tty_pair_get_tty);
|
|
|
|
-
|
|
|
|
-struct tty_struct *tty_pair_get_pty(struct tty_struct *tty)
|
|
|
|
-{
|
|
|
|
- if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
|
|
|
|
- tty->driver->subtype == PTY_TYPE_MASTER)
|
|
|
|
- return tty;
|
|
|
|
- return tty->link;
|
|
|
|
-}
|
|
|
|
-EXPORT_SYMBOL(tty_pair_get_pty);
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
* Split this up, as gcc can choke on it otherwise..
|
|
* Split this up, as gcc can choke on it otherwise..
|