Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4302d506 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ce4d72fa 0e2815de

arch/x86/ia32/ia32_signal.c

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <asm/ptrace.h>

#include <asm/ia32_unistd.h>

#include <asm/user32.h>

#include <asm/sigcontext32.h>

#include <uapi/asm/sigcontext.h>

#include <asm/proto.h>

#include <asm/vdso.h>

#include <asm/sigframe.h>
@@ -68,7 +68,7 @@ 
}



static int ia32_restore_sigcontext(struct pt_regs *regs,

				   struct sigcontext_ia32 __user *sc)

				   struct sigcontext_32 __user *sc)

{

	unsigned int tmpflags, err = 0;

	void __user *buf;
@@ -170,7 +170,7 @@ asmlinkage long sys32_rt_sigreturn(void) 
 * Set up a signal frame.

 */



static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,

static int ia32_setup_sigcontext(struct sigcontext_32 __user *sc,

				 void __user *fpstate,

				 struct pt_regs *regs, unsigned int mask)

{
@@ -234,7 +234,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, 
		unsigned long fx_aligned, math_size;



		sp = fpu__alloc_mathframe(sp, 1, &fx_aligned, &math_size);

		*fpstate = (struct _fpstate_ia32 __user *) sp;

		*fpstate = (struct _fpstate_32 __user *) sp;

		if (copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,

				    math_size) < 0)

			return (void __user *) -1L;

arch/x86/include/asm/fpu/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define _ASM_X86_FPU_SIGNAL_H



#ifdef CONFIG_X86_64

# include <asm/sigcontext32.h>

# include <uapi/asm/sigcontext.h>

# include <asm/user32.h>

struct ksignal;

int ia32_setup_rt_frame(int sig, struct ksignal *ksig,

arch/x86/include/asm/ia32.h

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * 32 bit structures for IA32 support.

 */



#include <asm/sigcontext32.h>

#include <uapi/asm/sigcontext.h>



/* signal.h */
@@ -18,7 +18,7 @@ struct ucontext_ia32 { 
	unsigned int	  uc_flags;

	unsigned int 	  uc_link;

	compat_stack_t	  uc_stack;

	struct sigcontext_ia32 uc_mcontext;

	struct sigcontext_32 uc_mcontext;

	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */

};

arch/x86/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct vm86; 
#include <asm/math_emu.h>

#include <asm/segment.h>

#include <asm/types.h>

#include <asm/sigcontext.h>

#include <uapi/asm/sigcontext.h>

#include <asm/current.h>

#include <asm/cpufeature.h>

#include <asm/page.h>

arch/x86/include/asm/sigcontext.h

+2 −73
Original line number Diff line number Diff line 
#ifndef _ASM_X86_SIGCONTEXT_H

#define _ASM_X86_SIGCONTEXT_H



#include <uapi/asm/sigcontext.h>



#ifdef __i386__

struct sigcontext {

	unsigned short gs, __gsh;

	unsigned short fs, __fsh;

	unsigned short es, __esh;

	unsigned short ds, __dsh;

	unsigned long di;

	unsigned long si;

	unsigned long bp;

	unsigned long sp;

	unsigned long bx;

	unsigned long dx;

	unsigned long cx;

	unsigned long ax;

	unsigned long trapno;

	unsigned long err;

	unsigned long ip;

	unsigned short cs, __csh;

	unsigned long flags;

	unsigned long sp_at_signal;

	unsigned short ss, __ssh;

/* This is a legacy header - all kernel code includes <uapi/asm/sigcontext.h> directly. */



	/*

	 * fpstate is really (struct _fpstate *) or (struct _xstate *)

	 * depending on the FP_XSTATE_MAGIC1 encoded in the SW reserved

	 * bytes of (struct _fpstate) and FP_XSTATE_MAGIC2 present at the end

	 * of extended memory layout. See comments at the definition of

	 * (struct _fpx_sw_bytes)

	 */

	void __user *fpstate;		/* zero when no FPU/extended context */

	unsigned long oldmask;

	unsigned long cr2;

};

#else /* __i386__ */

struct sigcontext {

	unsigned long r8;

	unsigned long r9;

	unsigned long r10;

	unsigned long r11;

	unsigned long r12;

	unsigned long r13;

	unsigned long r14;

	unsigned long r15;

	unsigned long di;

	unsigned long si;

	unsigned long bp;

	unsigned long bx;

	unsigned long dx;

	unsigned long ax;

	unsigned long cx;

	unsigned long sp;

	unsigned long ip;

	unsigned long flags;

	unsigned short cs;

	unsigned short gs;

	unsigned short fs;

	unsigned short __pad0;

	unsigned long err;

	unsigned long trapno;

	unsigned long oldmask;

	unsigned long cr2;

#include <uapi/asm/sigcontext.h>



	/*

	 * fpstate is really (struct _fpstate *) or (struct _xstate *)

	 * depending on the FP_XSTATE_MAGIC1 encoded in the SW reserved

	 * bytes of (struct _fpstate) and FP_XSTATE_MAGIC2 present at the end

	 * of extended memory layout. See comments at the definition of

	 * (struct _fpx_sw_bytes)

	 */

	void __user *fpstate;		/* zero when no FPU/extended context */

	unsigned long reserved1[8];

};

#endif /* !__i386__ */

#endif /* _ASM_X86_SIGCONTEXT_H */