Commit 38fc315a authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

termios: consolidate values for VDISCARD in INIT_C_CC 



On old systems it used to be ^O.  Linux had never actually used
the value, but INIT_C_CC (on i386) did initialize it to ^O;
unfortunately, it had a typo in the comment claiming that to be
^U.  Most of the architectures copied the (correct) definition
along with mistaken comment.  alpha, powerpc and sparc tried
to make the definition match comment.

However, util-linux still resets it to ^O on any architecture,
^O is the historical value, kernel ignores it anyway and finally,
Linus said "Just change everybody to do the same, nobody cares
about VDISCARD".

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/YxDmy//MKzs3ye7l@ZenIV


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

arch/alpha/include/asm/termios.h

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
/*	eof=^D		eol=\0		eol2=\0		erase=del

	werase=^W	kill=^U		reprint=^R	sxtc=\0

	intr=^C		quit=^\		susp=^Z		<OSF/1 VDSUSP>

	start=^Q	stop=^S		lnext=^V	discard=^U

	start=^Q	stop=^S		lnext=^V	discard=^O

	vmin=\1		vtime=\0

*/

#define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\025\001\000"

#define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\017\001\000"



#endif	/* _ALPHA_TERMIOS_H */

arch/mips/include/asm/termios.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 *	intr=^C		quit=^\		erase=del	kill=^U

 *	vmin=\1		vtime=\0	eol2=\0		swtc=\0

 *	start=^Q	stop=^S		susp=^Z		vdsusp=

 *	reprint=^R	discard=^U	werase=^W	lnext=^V

 *	reprint=^R	discard=^O	werase=^W	lnext=^V

 *	eof=^D		eol=\0

 */

#define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"

arch/powerpc/include/asm/termios.h

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#include <uapi/asm/termios.h>



/*                   ^C  ^\ del  ^U  ^D   1   0   0   0   0  ^W  ^R  ^Z  ^Q  ^S  ^V  ^U  */

#define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025" 

/*                   ^C  ^\ del  ^U  ^D   1   0   0   0   0  ^W  ^R  ^Z  ^Q  ^S  ^V  ^O  */

#define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\017"



#endif	/* _ASM_POWERPC_TERMIOS_H */

arch/sparc/include/asm/termios.h

+2 −2
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 
/*	intr=^C		quit=^\		erase=del	kill=^U

	eof=^D		eol=\0		eol2=\0		sxtc=\0

	start=^Q	stop=^S		susp=^Z		dsusp=^Y

	reprint=^R	discard=^U	werase=^W	lnext=^V

	reprint=^R	discard=^O	werase=^W	lnext=^V

	vmin=\1         vtime=\0

*/

#define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\025\027\026\001"

#define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\017\027\026\001"



#endif /* _SPARC_TERMIOS_H */

include/linux/termios_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
/*	intr=^C		quit=^\		erase=del	kill=^U

	eof=^D		vtime=\0	vmin=\1		sxtc=\0

	start=^Q	stop=^S		susp=^Z		eol=\0

	reprint=^R	discard=^U	werase=^W	lnext=^V

	reprint=^R	discard=^O	werase=^W	lnext=^V

	eol2=\0

*/

#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"