tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/YxDmy//MKzs3ye7l@ZenIV
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Al Viro and committed by
Greg Kroah-Hartman 38fc315a c9874d3f

+8 -8
+2 -2
arch/alpha/include/asm/termios.h
··· 8 8 /* eof=^D eol=\0 eol2=\0 erase=del 9 9 werase=^W kill=^U reprint=^R sxtc=\0 10 10 intr=^C quit=^\ susp=^Z <OSF/1 VDSUSP> 11 - start=^Q stop=^S lnext=^V discard=^U 11 + start=^Q stop=^S lnext=^V discard=^O 12 12 vmin=\1 vtime=\0 13 13 */ 14 - #define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\025\001\000" 14 + #define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\017\001\000" 15 15 16 16 #endif /* _ALPHA_TERMIOS_H */
+1 -1
arch/mips/include/asm/termios.h
··· 16 16 * intr=^C quit=^\ erase=del kill=^U 17 17 * vmin=\1 vtime=\0 eol2=\0 swtc=\0 18 18 * start=^Q stop=^S susp=^Z vdsusp= 19 - * reprint=^R discard=^U werase=^W lnext=^V 19 + * reprint=^R discard=^O werase=^W lnext=^V 20 20 * eof=^D eol=\0 21 21 */ 22 22 #define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"
+2 -2
arch/powerpc/include/asm/termios.h
··· 10 10 11 11 #include <uapi/asm/termios.h> 12 12 13 - /* ^C ^\ del ^U ^D 1 0 0 0 0 ^W ^R ^Z ^Q ^S ^V ^U */ 14 - #define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025" 13 + /* ^C ^\ del ^U ^D 1 0 0 0 0 ^W ^R ^Z ^Q ^S ^V ^O */ 14 + #define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\017" 15 15 16 16 #endif /* _ASM_POWERPC_TERMIOS_H */
+2 -2
arch/sparc/include/asm/termios.h
··· 9 9 /* intr=^C quit=^\ erase=del kill=^U 10 10 eof=^D eol=\0 eol2=\0 sxtc=\0 11 11 start=^Q stop=^S susp=^Z dsusp=^Y 12 - reprint=^R discard=^U werase=^W lnext=^V 12 + reprint=^R discard=^O werase=^W lnext=^V 13 13 vmin=\1 vtime=\0 14 14 */ 15 - #define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\025\027\026\001" 15 + #define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\017\027\026\001" 16 16 17 17 #endif /* _SPARC_TERMIOS_H */
+1 -1
include/linux/termios_internal.h
··· 9 9 /* intr=^C quit=^\ erase=del kill=^U 10 10 eof=^D vtime=\0 vmin=\1 sxtc=\0 11 11 start=^Q stop=^S susp=^Z eol=\0 12 - reprint=^R discard=^U werase=^W lnext=^V 12 + reprint=^R discard=^O werase=^W lnext=^V 13 13 eol2=\0 14 14 */ 15 15 #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"