From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932096AbbIHO1q (ORCPT ); Tue, 8 Sep 2015 10:27:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51954 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753483AbbIHO1l (ORCPT ); Tue, 8 Sep 2015 10:27:41 -0400 Date: Tue, 8 Sep 2015 07:26:36 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: oleg@redhat.com, dvlasenk@redhat.com, brgerst@gmail.com, peterz@infradead.org, luto@amacapital.net, linux-kernel@vger.kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, mikko.rapeli@iki.fi, mingo@kernel.org, bp@alien8.de, tglx@linutronix.de Reply-To: dvlasenk@redhat.com, brgerst@gmail.com, luto@amacapital.net, peterz@infradead.org, oleg@redhat.com, tglx@linutronix.de, mikko.rapeli@iki.fi, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@alien8.de, mingo@kernel.org In-Reply-To: <1441438363-9999-7-git-send-email-mingo@kernel.org> References: <1441438363-9999-7-git-send-email-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/headers] x86/headers: Unify register type definitions between 32-bit compat and i386 Git-Commit-ID: 337a167d1a5b2704414679d1a993220a4613ec13 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: 337a167d1a5b2704414679d1a993220a4613ec13 Gitweb: http://git.kernel.org/tip/337a167d1a5b2704414679d1a993220a4613ec13 Author: Ingo Molnar AuthorDate: Sat, 5 Sep 2015 09:32:34 +0200 Committer: Ingo Molnar CommitDate: Tue, 8 Sep 2015 10:03:56 +0200 x86/headers: Unify register type definitions between 32-bit compat and i386 The following sigcontext related types were duplicated across native 32-bit and compat 32-bit headers: struct _fpreg; struct _fpxreg; struct _xmmreg; X86_FXSR_MAGIC Unify them. 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-7-git-send-email-mingo@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/uapi/asm/sigcontext.h | 3 ++- arch/x86/include/uapi/asm/sigcontext32.h | 22 ---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h index 07b0e32..9df4df3 100644 --- a/arch/x86/include/uapi/asm/sigcontext.h +++ b/arch/x86/include/uapi/asm/sigcontext.h @@ -63,7 +63,6 @@ struct _fpx_sw_bytes { __u32 padding[7]; }; -#ifdef __i386__ /* * As documented in the iBCS2 standard: * @@ -96,6 +95,8 @@ struct _xmmreg { #define X86_FXSR_MAGIC 0x0000 +#ifdef __i386__ + struct _fpstate { /* Legacy FPU environment: */ __u32 cw; diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h index 939a848..356caab 100644 --- a/arch/x86/include/uapi/asm/sigcontext32.h +++ b/arch/x86/include/uapi/asm/sigcontext32.h @@ -3,30 +3,8 @@ /* Signal context definitions for compat 32-bit programs: */ -#include - #include -/* 10-byte legacy floating point register: */ -struct _fpreg { - __u16 significand[4]; - __u16 exponent; -}; - -/* 16-byte floating point register: */ -struct _fpxreg { - __u16 significand[4]; - __u16 exponent; - __u16 padding[3]; -}; - -/* 16-byte XMM vector register: */ -struct _xmmreg { - __u32 element[4]; -}; - -#define X86_FXSR_MAGIC 0x0000 - /* FXSAVE frame: FSAVE frame with extensions */ struct _fpstate_ia32 { /* Regular FPU environment: */