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

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

diff --cc arch/x86/ia32/ia32_signal.c
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/asm-offsets.c
index 95a18e25d5bfc5ce14f9e930eef09389c336c8d6,bc9f4afa889ae805dfba043ae31d8debd72c1f3d..439df975bc7aed0861581381476eeb933bc086de
--- 1/arch/x86/kernel/asm-offsets.c
--- 2/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@@ -43,16 -43,19 +43,16 @@@ 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(TI_sysenter_return, thread_info, sysenter_return);
 -
        BLANK();
        OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
  #endif

diff --cc arch/x86/kernel/fpu/signal.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge