x86/headers: Use ABI types consistently in sigcontext*.h

Use the __u16/32/64 types we standardized on in ABI definitions
- and which most of this header was already using.

This will allow us to more obviously unify the compat header
into the main header.

No change in functionality.

Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1441438363-9999-6-git-send-email-mingo@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h
index 40d6cbac08c66f16037598d66f87bd836e24c56f..07b0e32a1d23a2b3b2f0096d79a85733c73c756b 100644 (file)
--- a/arch/x86/include/uapi/asm/sigcontext.h
+++ b/arch/x86/include/uapi/asm/sigcontext.h
@@ -78,48 +78,48 @@ struct _fpx_sw_bytes {
 
 /* 10-byte legacy floating point register: */
 struct _fpreg {
-       unsigned short                  significand[4];
-       unsigned short                  exponent;
+       __u16                           significand[4];
+       __u16                           exponent;
 };
 
 /* 16-byte floating point register: */
 struct _fpxreg {
-       unsigned short                  significand[4];
-       unsigned short                  exponent;
-       unsigned short                  padding[3];
+       __u16                           significand[4];
+       __u16                           exponent;
+       __u16                           padding[3];
 };
 
 /* 16-byte XMM register: */
 struct _xmmreg {
-       unsigned long                   element[4];
+       __u32                           element[4];
 };
 
 #define X86_FXSR_MAGIC                 0x0000
 
 struct _fpstate {
        /* Legacy FPU environment: */
-       unsigned long                   cw;
-       unsigned long                   sw;
-       unsigned long                   tag;
-       unsigned long                   ipoff;
-       unsigned long                   cssel;
-       unsigned long                   dataoff;
-       unsigned long                   datasel;
+       __u32                           cw;
+       __u32                           sw;
+       __u32                           tag;
+       __u32                           ipoff;
+       __u32                           cssel;
+       __u32                           dataoff;
+       __u32                           datasel;
        struct _fpreg                   _st[8];
-       unsigned short                  status;
-       unsigned short                  magic;          /* 0xffff: regular FPU data only */
+       __u16                           status;
+       __u16                           magic;          /* 0xffff: regular FPU data only */
                                                        /* 0x0000: FXSR FPU data */
 
        /* FXSR FPU environment */
-       unsigned long                   _fxsr_env[6];   /* FXSR FPU env is ignored */
-       unsigned long                   mxcsr;
-       unsigned long                   reserved;
+       __u32                           _fxsr_env[6];   /* FXSR FPU env is ignored */
+       __u32                           mxcsr;
+       __u32                           reserved;
        struct _fpxreg                  _fxsr_st[8];    /* FXSR FPU reg data is ignored */
        struct _xmmreg                  _xmm[8];        /* First 8 XMM registers */
-       unsigned long                   padding1[44];   /* Second 8 XMM registers plus padding */
+       __u32                           padding1[44];   /* Second 8 XMM registers plus padding */
 
        union {
-               unsigned long           padding2[12];
+               __u32                   padding2[12];
                struct _fpx_sw_bytes    sw_reserved;    /* Potential extended state is encoded here */
        };
 };
@@ -191,28 +191,28 @@ struct _xstate {
 #ifndef __KERNEL__
 # ifdef __i386__
 struct sigcontext {
-       unsigned short                  gs, __gsh;
-       unsigned short                  fs, __fsh;
-       unsigned short                  es, __esh;
-       unsigned short                  ds, __dsh;
-       unsigned long                   edi;
-       unsigned long                   esi;
-       unsigned long                   ebp;
-       unsigned long                   esp;
-       unsigned long                   ebx;
-       unsigned long                   edx;
-       unsigned long                   ecx;
-       unsigned long                   eax;
-       unsigned long                   trapno;
-       unsigned long                   err;
-       unsigned long                   eip;
-       unsigned short                  cs, __csh;
-       unsigned long                   eflags;
-       unsigned long                   esp_at_signal;
-       unsigned short                  ss, __ssh;
+       __u16                           gs, __gsh;
+       __u16                           fs, __fsh;
+       __u16                           es, __esh;
+       __u16                           ds, __dsh;
+       __u32                           edi;
+       __u32                           esi;
+       __u32                           ebp;
+       __u32                           esp;
+       __u32                           ebx;
+       __u32                           edx;
+       __u32                           ecx;
+       __u32                           eax;
+       __u32                           trapno;
+       __u32                           err;
+       __u32                           eip;
+       __u16                           cs, __csh;
+       __u32                           eflags;
+       __u32                           esp_at_signal;
+       __u16                           ss, __ssh;
        struct _fpstate __user          *fpstate;
-       unsigned long                   oldmask;
-       unsigned long                   cr2;
+       __u32                           oldmask;
+       __u32                           cr2;
 };
 # else /* __x86_64__: */
 struct sigcontext {

diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h
index 6ff4fbab650ed7c0a7a01fe4b04e813db1aed57c..939a84885673705ce77b4633d5508a9379297c8c 100644 (file)
--- a/arch/x86/include/uapi/asm/sigcontext32.h
+++ b/arch/x86/include/uapi/asm/sigcontext32.h
@@ -9,15 +9,15 @@
 
 /* 10-byte legacy floating point register: */
 struct _fpreg {
-       unsigned short                  significand[4];
-       unsigned short                  exponent;
+       __u16                           significand[4];
+       __u16                           exponent;
 };
 
 /* 16-byte floating point register: */
 struct _fpxreg {
-       unsigned short                  significand[4];
-       unsigned short                  exponent;
-       unsigned short                  padding[3];
+       __u16                           significand[4];
+       __u16                           exponent;
+       __u16                           padding[3];
 };
 
 /* 16-byte XMM vector register: */
@@ -38,8 +38,8 @@ struct _fpstate_ia32 {
        __u32                           dataoff;
        __u32                           datasel;
        struct _fpreg                   _st[8];
-       unsigned short                  status;
-       unsigned short                  magic;          /* 0xffff: regular FPU data only */
+       __u16                           status;
+       __u16                           magic;          /* 0xffff: regular FPU data only */
                                                        /* 0x0000: FXSR data */
 
        /* Extended FXSR FPU environment: */
@@ -58,28 +58,28 @@ struct _fpstate_ia32 {
 
 /* 32-bit compat sigcontext: */
 struct sigcontext_ia32 {
-       unsigned short                  gs, __gsh;
-       unsigned short                  fs, __fsh;
-       unsigned short                  es, __esh;
-       unsigned short                  ds, __dsh;
-       unsigned int                    di;
-       unsigned int                    si;
-       unsigned int                    bp;
-       unsigned int                    sp;
-       unsigned int                    bx;
-       unsigned int                    dx;
-       unsigned int                    cx;
-       unsigned int                    ax;
-       unsigned int                    trapno;
-       unsigned int                    err;
-       unsigned int                    ip;
-       unsigned short                  cs, __csh;
-       unsigned int                    flags;
-       unsigned int                    sp_at_signal;
-       unsigned short                  ss, __ssh;
-       unsigned int                    fpstate;        /* Pointer to 'struct _fpstate_ia32' */
-       unsigned int                    oldmask;
-       unsigned int                    cr2;
+       __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_ia32' */
+       __u32                           oldmask;
+       __u32                           cr2;
 };
 
 #endif /* _ASM_X86_SIGCONTEXT32_H */