diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 12:19:31 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 12:19:31 +0300 |
commit | ba3b8bb1263dfb87914ef0ccf5f3a78604b3686b (patch) | |
tree | 142b9e56d8cae8f2c5514582bd767470a2b4147e /include/linux/tty.h | |
parent | e0efb3168d34dc8c8c72718672b8902e40efff8f (diff) | |
parent | 0477e92881850d44910a7e94fc2c46f96faa131f (diff) | |
download | linux-ba3b8bb1263dfb87914ef0ccf5f3a78604b3686b.tar.xz |
Merge 5.10-rc7 into tty-next
We want the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tty.h')
-rw-r--r-- | include/linux/tty.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 67c7a07c8083..0c2f97ba8018 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -305,6 +305,10 @@ struct tty_struct { struct ktermios termios, termios_locked; char name[64]; struct pid *pgrp; /* Protected by ctrl lock */ + /* + * Writes protected by both ctrl lock and legacy mutex, readers must use + * at least one of them. + */ struct pid *session; unsigned long flags; int count; |