From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755398AbbIHO3u (ORCPT ); Tue, 8 Sep 2015 10:29:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52061 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754968AbbIHO3r (ORCPT ); Tue, 8 Sep 2015 10:29:47 -0400 Date: Tue, 8 Sep 2015 07:28:35 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: mikko.rapeli@iki.fi, oleg@redhat.com, mingo@kernel.org, dvlasenk@redhat.com, peterz@infradead.org, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, brgerst@gmail.com, luto@amacapital.net, bp@alien8.de Reply-To: linux-kernel@vger.kernel.org, brgerst@gmail.com, luto@amacapital.net, bp@alien8.de, torvalds@linux-foundation.org, dvlasenk@redhat.com, peterz@infradead.org, mingo@kernel.org, mikko.rapeli@iki.fi, oleg@redhat.com, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1441438363-9999-13-git-send-email-mingo@kernel.org> References: <1441438363-9999-13-git-send-email-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/headers] x86/headers: Unify 'struct sigcontext_ia32' and 'struct sigcontext_32' Git-Commit-ID: db1e031401c6abab983919e882916d028f3b385e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: db1e031401c6abab983919e882916d028f3b385e Gitweb: http://git.kernel.org/tip/db1e031401c6abab983919e882916d028f3b385e Author: Ingo Molnar AuthorDate: Sat, 5 Sep 2015 09:32:40 +0200 Committer: Ingo Molnar CommitDate: Tue, 8 Sep 2015 10:03:58 +0200 x86/headers: Unify 'struct sigcontext_ia32' and 'struct sigcontext_32' The two structures are identical - merge them and keep the legacy name as a define. Acked-by: Mikko Rapeli Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/1441438363-9999-13-git-send-email-mingo@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/sigframe.h | 1 - arch/x86/include/uapi/asm/sigcontext.h | 2 ++ arch/x86/include/uapi/asm/sigcontext32.h | 26 -------------------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h index 5ff020a..98f0401 100644 --- a/arch/x86/include/asm/sigframe.h +++ b/arch/x86/include/asm/sigframe.h @@ -9,7 +9,6 @@ #ifdef CONFIG_X86_32 #define sigframe_ia32 sigframe #define rt_sigframe_ia32 rt_sigframe -#define sigcontext_ia32 sigcontext #define ucontext_ia32 ucontext #else /* !CONFIG_X86_32 */ diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h index d0def25..592bfaf 100644 --- a/arch/x86/include/uapi/asm/sigcontext.h +++ b/arch/x86/include/uapi/asm/sigcontext.h @@ -223,6 +223,8 @@ struct sigcontext_32 { __u32 cr2; }; +#define sigcontext_ia32 sigcontext_32 + struct sigcontext_64 { __u64 r8; __u64 r9; diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h index 06c749b..257fbb3 100644 --- a/arch/x86/include/uapi/asm/sigcontext32.h +++ b/arch/x86/include/uapi/asm/sigcontext32.h @@ -5,30 +5,4 @@ #include -/* 32-bit compat sigcontext: */ -struct sigcontext_ia32 { - __u16 gs, __gsh; - __u16 fs, __fsh; - __u16 es, __esh; - __u16 ds, __dsh; - __u32 di; - __u32 si; - __u32 bp; - __u32 sp; - __u32 bx; - __u32 dx; - __u32 cx; - __u32 ax; - __u32 trapno; - __u32 err; - __u32 ip; - __u16 cs, __csh; - __u32 flags; - __u32 sp_at_signal; - __u16 ss, __ssh; - __u32 fpstate; /* Pointer to 'struct _fpstate_32' */ - __u32 oldmask; - __u32 cr2; -}; - #endif /* _ASM_X86_SIGCONTEXT32_H */