From 23a51410ba468a81f36306f1fc3a5c7d9f41230e Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 16 Aug 2016 09:15:24 +0000 Subject: [PATCH] sparc64: fix tty ioctl numbers The structures defined in asm/termbits.h have the same size on sparc and sparc64. * linux/sparc64/ioctls_arch0.h (TCGETS, TCGETS2, TCSETS, TCSETS2, TCSETSF, TCSETSF2, TCSETSW, TCSETSW2): Sync with linux/sparc/ioctls_arch0.h --- linux/sparc64/ioctls_arch0.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/sparc64/ioctls_arch0.h b/linux/sparc64/ioctls_arch0.h index 6128dc9b..0e5f1a0e 100644 --- a/linux/sparc64/ioctls_arch0.h +++ b/linux/sparc64/ioctls_arch0.h @@ -48,19 +48,19 @@ { "asm/ioctls.h", "FIOQSIZE", _IOC_READ, 0x6680, 0x08 }, { "asm/ioctls.h", "TCFLSH", _IOC_NONE, 0x5407, 0x00 }, { "asm/ioctls.h", "TCGETA", _IOC_READ, 0x5401, 0x12 }, -{ "asm/ioctls.h", "TCGETS", _IOC_READ, 0x5408, 0x38 }, -{ "asm/ioctls.h", "TCGETS2", _IOC_READ, 0x540c, 0x40 }, +{ "asm/ioctls.h", "TCGETS", _IOC_READ, 0x5408, 0x24 }, +{ "asm/ioctls.h", "TCGETS2", _IOC_READ, 0x540c, 0x2c }, { "asm/ioctls.h", "TCSBRK", _IOC_NONE, 0x5405, 0x00 }, { "asm/ioctls.h", "TCSBRKP", 0, 0x5425, 0 }, { "asm/ioctls.h", "TCSETA", _IOC_WRITE, 0x5402, 0x12 }, { "asm/ioctls.h", "TCSETAF", _IOC_WRITE, 0x5404, 0x12 }, { "asm/ioctls.h", "TCSETAW", _IOC_WRITE, 0x5403, 0x12 }, -{ "asm/ioctls.h", "TCSETS", _IOC_WRITE, 0x5409, 0x38 }, -{ "asm/ioctls.h", "TCSETS2", _IOC_WRITE, 0x540d, 0x40 }, -{ "asm/ioctls.h", "TCSETSF", _IOC_WRITE, 0x540b, 0x38 }, -{ "asm/ioctls.h", "TCSETSF2", _IOC_WRITE, 0x540f, 0x40 }, -{ "asm/ioctls.h", "TCSETSW", _IOC_WRITE, 0x540a, 0x38 }, -{ "asm/ioctls.h", "TCSETSW2", _IOC_WRITE, 0x540e, 0x40 }, +{ "asm/ioctls.h", "TCSETS", _IOC_WRITE, 0x5409, 0x24 }, +{ "asm/ioctls.h", "TCSETS2", _IOC_WRITE, 0x540d, 0x2c }, +{ "asm/ioctls.h", "TCSETSF", _IOC_WRITE, 0x540b, 0x24 }, +{ "asm/ioctls.h", "TCSETSF2", _IOC_WRITE, 0x540f, 0x2c }, +{ "asm/ioctls.h", "TCSETSW", _IOC_WRITE, 0x540a, 0x24 }, +{ "asm/ioctls.h", "TCSETSW2", _IOC_WRITE, 0x540e, 0x2c }, { "asm/ioctls.h", "TCXONC", _IOC_NONE, 0x5406, 0x00 }, { "asm/ioctls.h", "TIOCCBRK", _IOC_NONE, 0x747a, 0x00 }, { "asm/ioctls.h", "TIOCCONS", _IOC_NONE, 0x7424, 0x00 },