diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-02 13:46:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-02 13:46:21 -0800 |
| commit | b89e32ccd1be92a3643df3908d3026b09e271616 (patch) | |
| tree | 5620ddd276041f34bd8f33464f0e2e6b75e12009 /arch/alpha/include/uapi | |
| parent | 03f51d4efa2287cc628bb20b0c032036d2a9e66a (diff) | |
| parent | 21ffceda1c8b3807615c40d440d7815e0c85d366 (diff) | |
| download | linux-b89e32ccd1be92a3643df3908d3026b09e271616.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha updates from Matt Turner:
"A few small fixes and clean ups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: fix crash if pthread_create races with signal delivery
alpha: fix formating of stack content
alpha: fix reboot on Avanti platform
alpha: deprecate pci_get_bus_and_slot()
alpha: Fix mixed up args in EXC macro in futex operations
alpha: osf_sys.c: use timespec64 where appropriate
alpha: osf_sys.c: fix put_tv32 regression
alpha: make thread_saved_pc static
alpha: make XTABS equivalent to TAB3
Diffstat (limited to 'arch/alpha/include/uapi')
| -rw-r--r-- | arch/alpha/include/uapi/asm/termbits.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/alpha/include/uapi/asm/termbits.h b/arch/alpha/include/uapi/asm/termbits.h index 05e0398a83a6..de6c8360fbe3 100644 --- a/arch/alpha/include/uapi/asm/termbits.h +++ b/arch/alpha/include/uapi/asm/termbits.h @@ -110,7 +110,11 @@ struct ktermios { #define VTDLY 00200000 #define VT0 00000000 #define VT1 00200000 -#define XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */ +/* + * Should be equivalent to TAB3, see description of TAB3 in + * POSIX.1-2008, Ch. 11.2.3 "Output Modes" + */ +#define XTABS TAB3 /* c_cflag bit meaning */ #define CBAUD 0000037 |