From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14305 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Samuel Holland Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH v2 3/3] Revert "mips,powerpc: fix TIOCSER_TEMT in termios.h" Date: Sat, 29 Jun 2019 18:19:06 -0500 Message-ID: <20190629231906.64452-4-samuel@sholland.org> References: <20190629231906.64452-1-samuel@sholland.org> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="251043"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Samuel Holland To: musl@lists.openwall.com Original-X-From: musl-return-14322-gllmg-musl=m.gmane.org@lists.openwall.com Sun Jun 30 01:19:36 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1hhMd4-0013Cd-Dz for gllmg-musl@m.gmane.org; Sun, 30 Jun 2019 01:19:34 +0200 Original-Received: (qmail 19472 invoked by uid 550); 29 Jun 2019 23:19:22 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 18119 invoked from network); 29 Jun 2019 23:19:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=xNsUwfolFyvRv nnahfmnIl38KE9+NnWbtxBkXXPfHjw=; b=iqZo/czHeBATd++j6//qlqhaC+YER mAelKJtSv2JmHU7HVOiTaASfKs4JuzaWD5gLNZnKn+2yfoARXOfB1iiP25/tu+wg C6w1A5LJhATxVeu2694QqgOcJFm7q47XNLMZLFPFCc78tJKBnrKX7bj2A1fqMa63 e2z9b2h4Rg3SpOQWIwtukIXeikoTSRuhRVOUgfex/mc93XdyeEsw8zHpKFrQ0PVx g9YKvNjld949XCdm/NX6AGcvADxhH284b2wYSH03NpggsZ1aaXWCUUJPKZAcM9hV rSAlhi1Oxs3eBqT6PTaj/0RPRxjG7DASsFI4DNPfDxmhXADqtn4kunsHg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=xNsUwfolFyvRvnnahfmnIl38KE9+NnWbtxBkXXPfHjw=; b=mLqdUyQa xl1hVwoTyrk18bXkM7/gYcYT55yNLe1k5Q5a0zbpJv7BXLZGUcJAyfGXYKmhNiZz AapxkDazf9dFUH3M8yisHgJqD/r46h/N1fQxUzLP8b0G7+J6j2zo7D3QsXUUHOUv Qeih99z8Edpe9KCfzlE8+EygYHscPhKhCfeZxf3sbuuPLJsrzlddo8AK+sj8U8fC M+E3cwJye8PPUqqBtrGjRWBwNRnMH1t7vuSdeMxdn61Hqkx45F7Du2GwedDdM0zt 6D+s5WKD7DS6ugOL92qe0Q34+PW0dmTW218yluqfmbzOsGkA8eDb1abeaes84eUX fisZ5vY7HtIn4g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrvdefgddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefurghmuhgvlhcujfholhhlrghnugcuoehsrghmuhgvlhesshhh ohhllhgrnhgurdhorhhgqeenucfkphepjedtrddufeehrddugeekrdduhedunecurfgrrh grmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgnecuvehl uhhsthgvrhfuihiivgeptd X-ME-Proxy: X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190629231906.64452-1-samuel@sholland.org> Xref: news.gmane.org gmane.linux.lib.musl.general:14305 Archived-At: Commit 3517d74a5e04a377192d1f4882ad6c8dc22ce69a changed the token in sys/ioctl.h from 0x01 to 1, so bits/termios.h no longer matches. Revert the bits/termios.h change to keep the headers in sync. This reverts commit 9eda4dc69c33852c97c6f69176bf45ffc80b522f. --- arch/mips/bits/termios.h | 2 +- arch/mips64/bits/termios.h | 2 +- arch/mipsn32/bits/termios.h | 2 +- arch/powerpc/bits/termios.h | 2 +- arch/powerpc64/bits/termios.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h index f7b9dd2e..9d571f78 100644 --- a/arch/mips/bits/termios.h +++ b/arch/mips/bits/termios.h @@ -165,5 +165,5 @@ struct termios { #define EXTPROC 0200000 #define XTABS 0014000 -#define TIOCSER_TEMT 0x01 +#define TIOCSER_TEMT 1 #endif diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h index f7b9dd2e..9d571f78 100644 --- a/arch/mips64/bits/termios.h +++ b/arch/mips64/bits/termios.h @@ -165,5 +165,5 @@ struct termios { #define EXTPROC 0200000 #define XTABS 0014000 -#define TIOCSER_TEMT 0x01 +#define TIOCSER_TEMT 1 #endif diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h index f7b9dd2e..9d571f78 100644 --- a/arch/mipsn32/bits/termios.h +++ b/arch/mipsn32/bits/termios.h @@ -165,5 +165,5 @@ struct termios { #define EXTPROC 0200000 #define XTABS 0014000 -#define TIOCSER_TEMT 0x01 +#define TIOCSER_TEMT 1 #endif diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h index e3f22e86..da1f406b 100644 --- a/arch/powerpc/bits/termios.h +++ b/arch/powerpc/bits/termios.h @@ -167,5 +167,5 @@ struct termios { #define EXTPROC 0x10000000 #define XTABS 00006000 -#define TIOCSER_TEMT 0x01 +#define TIOCSER_TEMT 1 #endif diff --git a/arch/powerpc64/bits/termios.h b/arch/powerpc64/bits/termios.h index e3f22e86..da1f406b 100644 --- a/arch/powerpc64/bits/termios.h +++ b/arch/powerpc64/bits/termios.h @@ -167,5 +167,5 @@ struct termios { #define EXTPROC 0x10000000 #define XTABS 00006000 -#define TIOCSER_TEMT 0x01 +#define TIOCSER_TEMT 1 #endif -- 2.21.0