From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02DA4144304; Thu, 13 Jun 2024 12:46:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718282776; cv=none; b=lJaWld+gk2E1GCIAYy9z/JXRZrQelXZjU5JHWPnTxFa6nq9fMMbZ/ciSpJeNRLlalQoO24DyQYIlXef0EJfYutvtBygSFOTELRqkp8RCgkY3d66f/X8edD4r6h91c9AEIRZ0kXr1uVSRHlkuQAq51T7RrNfStJTJkRqqZhrYSP0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718282776; c=relaxed/simple; bh=Glxh2HRMnyk+2ZQpTBHemrnCNm4eSvvrPNylHQfbD9I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UBBPUSYKb/jFnX3DnL7Wkt7rxTpBIVTGQmouk7T95CPba+QIjB77E9dKA3ToJ7Bd3vV3Z5JRhnxrCYM346Pm3SDp4AHrwyD0i/EnBPG/vhO2r77FfKyIq9mqsk5r0JMVLqWA4I5KVCdzN71I7gCFSCPQ6riImR4yY5HTiAjUxUE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=alSMgurl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="alSMgurl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CAABC2BBFC; Thu, 13 Jun 2024 12:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718282775; bh=Glxh2HRMnyk+2ZQpTBHemrnCNm4eSvvrPNylHQfbD9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=alSMgurlbgjYLZnm3uuSlS2o2W5w83TsAgAdPApFcUJusbHyB4EB3iUI6UjCsQpRz t2ixO5MPKgh/rT0zL90e3xvoJ9VQR1N8j8gu8sWrc+2OXBHxaWdGvwXA1G+gCNcSR9 8oL9QDz1pAFzQe4lX/v6eNL1o+ATIsIWR8f9SR4E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mike Gilbert , Andreas Larsson Subject: [PATCH 5.15 392/402] sparc: move struct termio to asm/termios.h Date: Thu, 13 Jun 2024 13:35:49 +0200 Message-ID: <20240613113317.444766789@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113302.116811394@linuxfoundation.org> References: <20240613113302.116811394@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mike Gilbert commit c32d18e7942d7589b62e301eb426b32623366565 upstream. Every other arch declares struct termio in asm/termios.h, so make sparc match them. Resolves a build failure in the PPP software package, which includes both bits/ioctl-types.h via sys/ioctl.h (glibc) and asm/termbits.h. Closes: https://bugs.gentoo.org/918992 Signed-off-by: Mike Gilbert Cc: stable@vger.kernel.org Reviewed-by: Andreas Larsson Tested-by: Andreas Larsson Link: https://lore.kernel.org/r/20240306171149.3843481-1-floppym@gentoo.org Signed-off-by: Andreas Larsson Signed-off-by: Greg Kroah-Hartman --- arch/sparc/include/uapi/asm/termbits.h | 10 ---------- arch/sparc/include/uapi/asm/termios.h | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) --- a/arch/sparc/include/uapi/asm/termbits.h +++ b/arch/sparc/include/uapi/asm/termbits.h @@ -13,16 +13,6 @@ typedef unsigned int tcflag_t; typedef unsigned long tcflag_t; #endif -#define NCC 8 -struct termio { - unsigned short c_iflag; /* input mode flags */ - unsigned short c_oflag; /* output mode flags */ - unsigned short c_cflag; /* control mode flags */ - unsigned short c_lflag; /* local mode flags */ - unsigned char c_line; /* line discipline */ - unsigned char c_cc[NCC]; /* control characters */ -}; - #define NCCS 17 struct termios { tcflag_t c_iflag; /* input mode flags */ --- a/arch/sparc/include/uapi/asm/termios.h +++ b/arch/sparc/include/uapi/asm/termios.h @@ -40,5 +40,14 @@ struct winsize { unsigned short ws_ypixel; }; +#define NCC 8 +struct termio { + unsigned short c_iflag; /* input mode flags */ + unsigned short c_oflag; /* output mode flags */ + unsigned short c_cflag; /* control mode flags */ + unsigned short c_lflag; /* local mode flags */ + unsigned char c_line; /* line discipline */ + unsigned char c_cc[NCC]; /* control characters */ +}; #endif /* _UAPI_SPARC_TERMIOS_H */