Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 sigcontext header cleanups from Ingo Molnar:
 "This series reorganizes and cleans up various aspects of the main
  sigcontext UAPI headers, such as unifying the data structures and
  updating/adding lots of comments to explain all the ABI details and
  quirks.  The headers can now also be built in user-space standalone"

* 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/headers: Clean up too long lines
  x86/headers: Remove <asm/sigcontext.h> references on the kernel side
  x86/headers: Remove direct sigcontext32.h uses
  x86/headers: Convert sigcontext_ia32 uses to sigcontext_32
  x86/headers: Unify 'struct sigcontext_ia32' and 'struct sigcontext_32'
  x86/headers: Make sigcontext pointers bit independent
  x86/headers: Move the 'struct sigcontext' definitions into the UAPI header
  x86/headers: Clean up the kernel's struct sigcontext types to be ABI-clean
  x86/headers: Convert uses of _fpstate_ia32 to _fpstate_32
  x86/headers: Unify 'struct _fpstate_ia32' and i386 struct _fpstate
  x86/headers: Unify register type definitions between 32-bit compat and i386
  x86/headers: Use ABI types consistently in sigcontext*.h
  x86/headers: Separate out legacy user-space structure definitions
  x86/headers: Clean up and better document uapi/asm/sigcontext.h
  x86/headers: Clean up uapi/asm/sigcontext32.h
  x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h

3 files changed, 14 insertions, 12 deletions

diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 95a18e25d5bf..439df975bc7a 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -43,15 +43,15 @@ void common(void) {
 
 #if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)
         BLANK();
-        OFFSET(IA32_SIGCONTEXT_ax, sigcontext_ia32, ax);
-        OFFSET(IA32_SIGCONTEXT_bx, sigcontext_ia32, bx);
-        OFFSET(IA32_SIGCONTEXT_cx, sigcontext_ia32, cx);
-        OFFSET(IA32_SIGCONTEXT_dx, sigcontext_ia32, dx);
-        OFFSET(IA32_SIGCONTEXT_si, sigcontext_ia32, si);
-        OFFSET(IA32_SIGCONTEXT_di, sigcontext_ia32, di);
-        OFFSET(IA32_SIGCONTEXT_bp, sigcontext_ia32, bp);
-        OFFSET(IA32_SIGCONTEXT_sp, sigcontext_ia32, sp);
-        OFFSET(IA32_SIGCONTEXT_ip, sigcontext_ia32, ip);
+        OFFSET(IA32_SIGCONTEXT_ax, sigcontext_32, ax);
+        OFFSET(IA32_SIGCONTEXT_bx, sigcontext_32, bx);
+        OFFSET(IA32_SIGCONTEXT_cx, sigcontext_32, cx);
+        OFFSET(IA32_SIGCONTEXT_dx, sigcontext_32, dx);
+        OFFSET(IA32_SIGCONTEXT_si, sigcontext_32, si);
+        OFFSET(IA32_SIGCONTEXT_di, sigcontext_32, di);
+        OFFSET(IA32_SIGCONTEXT_bp, sigcontext_32, bp);
+        OFFSET(IA32_SIGCONTEXT_sp, sigcontext_32, sp);
+        OFFSET(IA32_SIGCONTEXT_ip, sigcontext_32, ip);
 
         BLANK();
         OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
index eb032677f939..ef29b742cea7 100644
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -56,7 +56,7 @@ static inline int save_fsave_header(struct task_struct *tsk, void __user *buf)
         if (use_fxsr()) {
                 struct xregs_state *xsave = &tsk->thread.fpu.state.xsave;
                 struct user_i387_ia32_struct env;
-                struct _fpstate_ia32 __user *fp = buf;
+                struct _fpstate_32 __user *fp = buf;
 
                 convert_from_fxsr(&env, tsk);
 
@@ -165,7 +165,7 @@ int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
         if (!static_cpu_has(X86_FEATURE_FPU))
                 return fpregs_soft_get(current, NULL, 0,
                         sizeof(struct user_i387_ia32_struct), NULL,
-                        (struct _fpstate_ia32 __user *) buf) ? -1 : 1;
+                        (struct _fpstate_32 __user *) buf) ? -1 : 1;
 
         if (fpregs_active()) {
                 /* Save the live register state to the user directly. */
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 32165d649979..b7ffb7c00075 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -63,6 +63,7 @@
 
 int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
 {
+        unsigned long buf_val;
         void __user *buf;
         unsigned int tmpflags;
         unsigned int err = 0;
@@ -107,7 +108,8 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
                 regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
                 regs->orig_ax = -1;             /* disable syscall checks */
 
-                get_user_ex(buf, &sc->fpstate);
+                get_user_ex(buf_val, &sc->fpstate);
+                buf = (void __user *)buf_val;
         } get_user_catch(err);
 
         err |= fpu__restore_sig(buf, config_enabled(CONFIG_X86_32));