Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae92c1f5 authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

TTY: export NR_LDISC and N_* line discipline numbers to user-space 



Since commit (4564f9e5: consolidate line discipline number definitions)
the patch moved all line discipline number from a per-architecture termios.h
to a shared one: tty.h. However, prior to this consolidation work, the
line discipline numbers were outside of an ifdef __KERNEL__/endif block
so these numbers used to be exported to user-space.

Since such numbers are kernel ABI anyway, and tty.h is already included
for user- space header processing, just move these relevant defines
outside of the ifdef __KERNEL__/endif block in include/linux/tty.h.

CC: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: default avatarFlorian Fainelli <ffainelli@freebox.fr>
Acked-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0e2adc06

include/linux/tty.h

+19 −18
Original line number Diff line number Diff line
@@ -5,24 +5,6 @@ 
 * 'tty.h' defines some structures used by tty_io.c and some defines.

 */



#ifdef __KERNEL__

#include <linux/fs.h>

#include <linux/major.h>

#include <linux/termios.h>

#include <linux/workqueue.h>

#include <linux/tty_driver.h>

#include <linux/tty_ldisc.h>

#include <linux/mutex.h>



#include <asm/system.h>





/*

 * (Note: the *_driver.minor_start values 1, 64, 128, 192 are

 * hardcoded at present.)

 */

#define NR_UNIX98_PTY_DEFAULT	4096      /* Default maximum for Unix98 ptys */

#define NR_UNIX98_PTY_MAX	(1 << MINORBITS) /* Absolute limit */

#define NR_LDISCS		30



/* line disciplines */
@@ -53,6 +35,25 @@ 
#define N_TRACESINK	23	/* Trace data routing for MIPI P1149.7 */

#define N_TRACEROUTER	24	/* Trace data routing for MIPI P1149.7 */



#ifdef __KERNEL__

#include <linux/fs.h>

#include <linux/major.h>

#include <linux/termios.h>

#include <linux/workqueue.h>

#include <linux/tty_driver.h>

#include <linux/tty_ldisc.h>

#include <linux/mutex.h>



#include <asm/system.h>





/*

 * (Note: the *_driver.minor_start values 1, 64, 128, 192 are

 * hardcoded at present.)

 */

#define NR_UNIX98_PTY_DEFAULT	4096      /* Default maximum for Unix98 ptys */

#define NR_UNIX98_PTY_MAX	(1 << MINORBITS) /* Absolute limit */



/*

 * This character is the same as _POSIX_VDISABLE: it cannot be used as

 * a c_cc[] character, but indicates that a particular special character