termios: get rid of non-UAPI asm/termios.h

All non-UAPI asm/termios.h consist of include of UAPI counterpart and, possibly, include of linux/uaccess.h The latter can't be simply removed, even though nothing in linux/termios.h doesn't depend upon it anymore - there are several places that rely upon that indirect chain of includes to pull linux/uaccess.h. So the include needs to be lifted out of there - we lift into tty_driver.h, serdev.h and places that pull asm/termios.h, but none of * linux/uaccess.h (obvious) * net/sock.h (pulls uaccess.h) * linux/{tty,tty_driver,serdev}.h (tty.h pulls tty_driver.h) That leaves us just with the include of UAPI asm/termios.h, which is what <asm/termios.h> will resolve to if we simply remove non-UAPI header. Signed-off-by: Al Viro <[email protected]> Link: https://lore.kernel.org/r/YxDnKvYCHn/ogBUv@ZenIV Signed-off-by: Greg Kroah-Hartman <[email protected]>
josf · Sep 9, 2022 · 89bbeb7 · 89bbeb7
1 parent e7b4c81
commit 89bbeb7
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 85 deletions.
diff --git a/arch/alpha/include/asm/termios.h b/arch/alpha/include/asm/termios.h
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
+#include <linux/uaccess.h>
 #include <linux/termios.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/serial.h>

diff --git a/arch/arm/mach-versatile/integrator_ap.c b/arch/arm/mach-versatile/integrator_ap.c
@@ -11,6 +11,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
+#include <linux/uaccess.h>
 #include <linux/termios.h>
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>

diff --git a/arch/ia64/include/asm/termios.h b/arch/ia64/include/asm/termios.h
diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h
diff --git a/arch/parisc/include/asm/termios.h b/arch/parisc/include/asm/termios.h
diff --git a/arch/powerpc/include/asm/termios.h b/arch/powerpc/include/asm/termios.h
diff --git a/arch/s390/include/asm/termios.h b/arch/s390/include/asm/termios.h
diff --git a/arch/sparc/include/asm/termios.h b/arch/sparc/include/asm/termios.h
diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c
@@ -13,6 +13,7 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/uaccess.h>
 #include <linux/termios.h>
 #include <linux/wwan.h>
 #include <net/rtnetlink.h>

diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h
diff --git a/include/linux/serdev.h b/include/linux/serdev.h
@@ -7,6 +7,7 @@
 
 #include <linux/types.h>
 #include <linux/device.h>
+#include <linux/uaccess.h>
 #include <linux/termios.h>
 #include <linux/delay.h>
 

diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
@@ -7,6 +7,7 @@
 #include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/cdev.h>
+#include <linux/uaccess.h>
 #include <linux/termios.h>
 #include <linux/seq_file.h>