From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753110AbbIEHed (ORCPT ); Sat, 5 Sep 2015 03:34:33 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:33444 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752466AbbIEHdS (ORCPT ); Sat, 5 Sep 2015 03:33:18 -0400 From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli , Andy Lutomirski , Andrew Morton , Denys Vlasenko , Brian Gerst , Peter Zijlstra , Borislav Petkov , "H. Peter Anvin" , Linus Torvalds , Oleg Nesterov , Thomas Gleixner Subject: [PATCH 06/15] x86/headers: Unify register type definitions between 32-bit compat and i386 Date: Sat, 5 Sep 2015 09:32:34 +0200 Message-Id: <1441438363-9999-7-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441438363-9999-1-git-send-email-mingo@kernel.org> References: <1441438363-9999-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Mikko Rapeli Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.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 07b0e32a1d23..9df4df3e40ef 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 939a84885673..356caab997e7 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: */ -- 2.1.4