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 5305544C6F; Thu, 13 Jun 2024 12:11:49 +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=1718280709; cv=none; b=qxGn8bRteoSAIaiSduTfYZcXuYdsCrMTjxXFzJtrIkg0FochVk8yGBCXLObBB+FP1r5aFtNx7v7brw77qa2vPr8JPcyCtJl7JwaX2O+rYm/WCe4eq2c2/WymoDEjcdlyWQvSQYE5ZHV7o0YtBEmB8DFRS3qCuBtERBrciT7aOdk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718280709; c=relaxed/simple; bh=sLbEUXlXp2pvmcdXZC3fTRiOuDJNr2hvtdb+zH8jLnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mbsI5CZeKr3HZuE+wqQcSJsKPaj7vkL4age5HF9f6ILQsBm29EjxRGLNQqhtdoQktz3ruIXWV3dJW8OO3OKqm3IlRjh8WyOJrQDB8zU+UaoE+ZkSI95F74ck0Trhactn0r9H1MKnhISPSmST+zOMfQA6C3RGk1FhN+N0pmIZxvA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bmNmHf10; 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="bmNmHf10" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FF7FC2BBFC; Thu, 13 Jun 2024 12:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718280708; bh=sLbEUXlXp2pvmcdXZC3fTRiOuDJNr2hvtdb+zH8jLnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bmNmHf101jTqOchRnegeALvQm1WcNuUByOa1CLdE/qYmAr9v6/6N12mmHDXwkxasM M+ZgKG7tMizPPtnyqyuH9BRLuWFrJSMd0gqQ2+25xjrhLLZOLLICb1KSy9SQaajl4d 0gfxIyEm2J0abkIzhinuJokrRS60+SidrkaMgzEs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mike Gilbert , Andreas Larsson Subject: [PATCH 6.6 105/137] sparc: move struct termio to asm/termios.h Date: Thu, 13 Jun 2024 13:34:45 +0200 Message-ID: <20240613113227.371012156@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113223.281378087@linuxfoundation.org> References: <20240613113223.281378087@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 6.6-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 @@ -10,16 +10,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 */