From 058c0b2d700b1092ad5967c742c790b9c807e6ae Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sun, 3 Jul 2016 17:05:08 +0200 Subject: [PATCH] remove mips and powerpc ioctls that are missing from linux uapi mips and powerpc use their own asm/ioctls.h, not the asm-generic/ioctls.h and they lack termiox macros that are available on other targets. see kernel commit 1d65b4a088de407e99714fdc27862449db04fb5c --- arch/mips/bits/ioctl.h | 5 ----- arch/mips64/bits/ioctl.h | 5 ----- arch/mipsn32/bits/ioctl.h | 5 ----- arch/powerpc/bits/ioctl.h | 8 -------- arch/powerpc64/bits/ioctl.h | 8 -------- 5 files changed, 31 deletions(-) diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h index 02c60bdf..cf27733c 100644 --- a/arch/mips/bits/ioctl.h +++ b/arch/mips/bits/ioctl.h @@ -89,11 +89,6 @@ #define TIOCMIWAIT 0x5491 #define TIOCGICOUNT 0x5492 -#define TCGETX 0x5432 // RICH: Not sure about these. -#define TCSETX 0x5433 // RICH: Not sure about these. -#define TCSETXF 0x5434 // RICH: Not sure about these. -#define TCSETXW 0x5435 // RICH: Not sure about these. - #define TIOCPKT_DATA 0 #define TIOCPKT_FLUSHREAD 1 #define TIOCPKT_FLUSHWRITE 2 diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h index 4de7d1a2..cf27733c 100644 --- a/arch/mips64/bits/ioctl.h +++ b/arch/mips64/bits/ioctl.h @@ -89,11 +89,6 @@ #define TIOCMIWAIT 0x5491 #define TIOCGICOUNT 0x5492 -#define TCGETX 0x5432 -#define TCSETX 0x5433 -#define TCSETXF 0x5434 -#define TCSETXW 0x5435 - #define TIOCPKT_DATA 0 #define TIOCPKT_FLUSHREAD 1 #define TIOCPKT_FLUSHWRITE 2 diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h index 4de7d1a2..cf27733c 100644 --- a/arch/mipsn32/bits/ioctl.h +++ b/arch/mipsn32/bits/ioctl.h @@ -89,11 +89,6 @@ #define TIOCMIWAIT 0x5491 #define TIOCGICOUNT 0x5492 -#define TCGETX 0x5432 -#define TCSETX 0x5433 -#define TCSETXF 0x5434 -#define TCSETXW 0x5435 - #define TIOCPKT_DATA 0 #define TIOCPKT_FLUSHREAD 1 #define TIOCPKT_FLUSHWRITE 2 diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h index 1424b2dc..6d49cf4e 100644 --- a/arch/powerpc/bits/ioctl.h +++ b/arch/powerpc/bits/ioctl.h @@ -120,14 +120,6 @@ #define TIOCGICOUNT 0x545D -/* end kernel header ioctls.h */ - - -#define TCGETX 0x5432 -#define TCSETX 0x5433 -#define TCSETXF 0x5434 -#define TCSETXW 0x5435 - struct winsize { unsigned short ws_row; unsigned short ws_col; diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h index 1424b2dc..6d49cf4e 100644 --- a/arch/powerpc64/bits/ioctl.h +++ b/arch/powerpc64/bits/ioctl.h @@ -120,14 +120,6 @@ #define TIOCGICOUNT 0x545D -/* end kernel header ioctls.h */ - - -#define TCGETX 0x5432 -#define TCSETX 0x5433 -#define TCSETXF 0x5434 -#define TCSETXW 0x5435 - struct winsize { unsigned short ws_row; unsigned short ws_col; -- 2.40.0