Commit 89bbeb7e authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/YxDnKvYCHn/ogBUv@ZenIV


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7b4c812

arch/alpha/include/asm/termios.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ALPHA_TERMIOS_H

#define _ALPHA_TERMIOS_H



#include <linux/uaccess.h>

#include <uapi/asm/termios.h>



#endif	/* _ALPHA_TERMIOS_H */

arch/arm/mach-ep93xx/core.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-versatile/integrator_ap.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/ia64/include/asm/termios.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Modified 1999

 *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co

 *

 * 99/01/28	Added N_IRDA and N_SMSBLOCK

 */

#ifndef _ASM_IA64_TERMIOS_H

#define _ASM_IA64_TERMIOS_H



#include <uapi/asm/termios.h>



#endif /* _ASM_IA64_TERMIOS_H */

arch/mips/include/asm/termios.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1995, 1996, 2000, 2001 by Ralf Baechle

 * Copyright (C) 2000, 2001 Silicon Graphics, Inc.

 */

#ifndef _ASM_TERMIOS_H

#define _ASM_TERMIOS_H



#include <linux/uaccess.h>

#include <uapi/asm/termios.h>



#endif /* _ASM_TERMIOS_H */