Author: kevans
Date: Sun Dec 22 19:06:45 2019
New Revision: 356020
URL: https://svnweb.freebsd.org/changeset/base/356020
Log:
MFC r355206, r355212, r355257, r355271: tty nits
r355206: tty_pts: don't rely on tty header pollution for sys/mutex.h
r355212: tty_rel_gone: add locking assertion
r355257: usb: remove some extraneous tty.h includes
r355271: Remove more needless <sys/tty.h> includes
Modified:
stable/11/sys/arm/samsung/exynos/chrome_kb.c
stable/11/sys/arm/samsung/exynos/exynos_uart.c
stable/11/sys/arm/versatile/pl050.c
stable/11/sys/arm/xilinx/uart_dev_cdnc.c
stable/11/sys/dev/gpio/gpiokeys.c
stable/11/sys/dev/quicc/quicc_bfe_fdt.c
stable/11/sys/dev/rp/rp_isa.c
stable/11/sys/dev/rp/rp_pci.c
stable/11/sys/dev/usb/input/uep.c
stable/11/sys/dev/usb/input/ukbd.c
stable/11/sys/dev/usb/input/ums.c
stable/11/sys/kern/tty.c
stable/11/sys/kern/tty_pts.c
stable/11/sys/powerpc/psim/uart_iobus.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/arm/samsung/exynos/chrome_kb.c
stable/12/sys/arm/samsung/exynos/exynos_uart.c
stable/12/sys/arm/versatile/pl050.c
stable/12/sys/arm/xilinx/uart_dev_cdnc.c
stable/12/sys/dev/gpio/gpiokeys.c
stable/12/sys/dev/quicc/quicc_bfe_fdt.c
stable/12/sys/dev/rp/rp_isa.c
stable/12/sys/dev/rp/rp_pci.c
stable/12/sys/dev/usb/input/uep.c
stable/12/sys/dev/usb/input/ukbd.c
stable/12/sys/dev/usb/input/ums.c
stable/12/sys/kern/tty.c
stable/12/sys/kern/tty_pts.c
stable/12/sys/powerpc/psim/uart_iobus.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/arm/samsung/exynos/chrome_kb.c
==============================================================================
--- stable/11/sys/arm/samsung/exynos/chrome_kb.c Sun Dec 22 18:55:09
2019 (r356019)
+++ stable/11/sys/arm/samsung/exynos/chrome_kb.c Sun Dec 22 19:06:45
2019 (r356020)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ioccom.h>
#include <sys/filio.h>
-#include <sys/tty.h>
#include <sys/kbio.h>
#include <machine/bus.h>
Modified: stable/11/sys/arm/samsung/exynos/exynos_uart.c
==============================================================================
--- stable/11/sys/arm/samsung/exynos/exynos_uart.c Sun Dec 22 18:55:09
2019 (r356019)
+++ stable/11/sys/arm/samsung/exynos/exynos_uart.c Sun Dec 22 19:06:45
2019 (r356020)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/cons.h>
-#include <sys/tty.h>
#include <sys/rman.h>
#include <machine/bus.h>
#include <machine/intr.h>
Modified: stable/11/sys/arm/versatile/pl050.c
==============================================================================
--- stable/11/sys/arm/versatile/pl050.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/arm/versatile/pl050.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -35,8 +35,10 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/malloc.h>
+#include <sys/mutex.h>
#include <sys/rman.h>
#include <sys/proc.h>
#include <sys/sched.h>
@@ -53,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ioccom.h>
#include <sys/filio.h>
-#include <sys/tty.h>
#include <sys/kbio.h>
#include <dev/kbd/kbdreg.h>
Modified: stable/11/sys/arm/xilinx/uart_dev_cdnc.c
==============================================================================
--- stable/11/sys/arm/xilinx/uart_dev_cdnc.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/arm/xilinx/uart_dev_cdnc.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/cons.h>
-#include <sys/tty.h>
#include <machine/bus.h>
#include <dev/uart/uart.h>
Modified: stable/11/sys/dev/gpio/gpiokeys.c
==============================================================================
--- stable/11/sys/dev/gpio/gpiokeys.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/dev/gpio/gpiokeys.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ioccom.h>
#include <sys/filio.h>
-#include <sys/tty.h>
#include <sys/kbio.h>
#include <dev/kbd/kbdreg.h>
Modified: stable/11/sys/dev/quicc/quicc_bfe_fdt.c
==============================================================================
--- stable/11/sys/dev/quicc/quicc_bfe_fdt.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/dev/quicc/quicc_bfe_fdt.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/rman.h>
-#include <sys/tty.h>
#include <machine/bus.h>
#include <dev/ofw/ofw_bus.h>
Modified: stable/11/sys/dev/rp/rp_isa.c
==============================================================================
--- stable/11/sys/dev/rp/rp_isa.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/dev/rp/rp_isa.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -41,10 +41,11 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
-#include <sys/tty.h>
#include <sys/conf.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/module.h>
+#include <sys/mutex.h>
#include <machine/resource.h>
#include <machine/bus.h>
#include <sys/bus.h>
Modified: stable/11/sys/dev/rp/rp_pci.c
==============================================================================
--- stable/11/sys/dev/rp/rp_pci.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/dev/rp/rp_pci.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -40,10 +40,11 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
-#include <sys/tty.h>
#include <sys/conf.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/module.h>
+#include <sys/mutex.h>
#include <machine/resource.h>
#include <machine/bus.h>
#include <sys/bus.h>
Modified: stable/11/sys/dev/usb/input/uep.c
==============================================================================
--- stable/11/sys/dev/usb/input/uep.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/dev/usb/input/uep.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -49,7 +49,6 @@
#include <sys/ioccom.h>
#include <sys/fcntl.h>
-#include <sys/tty.h>
#define USB_DEBUG_VAR uep_debug
#include <dev/usb/usb_debug.h>
Modified: stable/11/sys/dev/usb/input/ukbd.c
==============================================================================
--- stable/11/sys/dev/usb/input/ukbd.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/dev/usb/input/ukbd.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ioccom.h>
#include <sys/filio.h>
-#include <sys/tty.h>
#include <sys/kbio.h>
#include <dev/kbd/kbdreg.h>
Modified: stable/11/sys/dev/usb/input/ums.c
==============================================================================
--- stable/11/sys/dev/usb/input/ums.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/dev/usb/input/ums.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ioccom.h>
#include <sys/filio.h>
-#include <sys/tty.h>
#include <sys/mouse.h>
#ifdef USB_DEBUG
Modified: stable/11/sys/kern/tty.c
==============================================================================
--- stable/11/sys/kern/tty.c Sun Dec 22 18:55:09 2019 (r356019)
+++ stable/11/sys/kern/tty.c Sun Dec 22 19:06:45 2019 (r356020)
@@ -1169,6 +1169,7 @@ void
tty_rel_gone(struct tty *tp)
{
+ tty_lock_assert(tp, MA_OWNED);
MPASS(!tty_gone(tp));
/* Simulate carrier removal. */
Modified: stable/11/sys/kern/tty_pts.c
==============================================================================
--- stable/11/sys/kern/tty_pts.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/kern/tty_pts.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/limits.h>
#include <sys/malloc.h>
+#include <sys/mutex.h>
#include <sys/poll.h>
#include <sys/proc.h>
#include <sys/racct.h>
Modified: stable/11/sys/powerpc/psim/uart_iobus.c
==============================================================================
--- stable/11/sys/powerpc/psim/uart_iobus.c Sun Dec 22 18:55:09 2019
(r356019)
+++ stable/11/sys/powerpc/psim/uart_iobus.c Sun Dec 22 19:06:45 2019
(r356020)
@@ -40,7 +40,6 @@
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/module.h>
-#include <sys/tty.h>
#include <machine/bus.h>
#include <sys/timepps.h>
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
