From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14507 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Baruch Siach Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 2/2] fix risc64 user_regs_struct conflict with kernel header Date: Tue, 6 Aug 2019 08:51:14 +0300 Message-ID: References: <63f4c551e85a848e336f41539b6dd283396eeda7.1565070674.git.baruch@tkos.co.il> 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="41061"; mail-complaints-to="usenet@blaine.gmane.org" Cc: musl@lists.openwall.com, Baruch Siach To: Rich Felker Original-X-From: musl-return-14523-gllmg-musl=m.gmane.org@lists.openwall.com Tue Aug 06 07:51:43 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 1husNq-000AZw-7V for gllmg-musl@m.gmane.org; Tue, 06 Aug 2019 07:51:42 +0200 Original-Received: (qmail 7763 invoked by uid 550); 6 Aug 2019 05:51:34 -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 7690 invoked from network); 6 Aug 2019 05:51:33 -0000 X-Mailer: git-send-email 2.20.1 In-Reply-To: <63f4c551e85a848e336f41539b6dd283396eeda7.1565070674.git.baruch@tkos.co.il> Xref: news.gmane.org gmane.linux.lib.musl.general:14507 Archived-At: Rename user_regs_struct following the example of s390 to avoid conflict with the kernel asm/ptrace.h header. --- arch/riscv64/bits/user.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv64/bits/user.h b/arch/riscv64/bits/user.h index bd0f0fc7027f..097c7ad6ce18 100644 --- a/arch/riscv64/bits/user.h +++ b/arch/riscv64/bits/user.h @@ -1,4 +1,4 @@ -struct user_regs_struct { +struct _user_regs_struct { unsigned long pc; unsigned long ra; unsigned long sp; -- 2.20.1