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

Commit fcbc99c4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Split out fpu/signal.h from fpu/internal.h for signal frame handling functions 



Most of the FPU does not use them, so split it out and include
them in signal.c and ia32_signal.c

Also fix header file dependency assumption in fpu/core.c.

Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.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>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 05012c13

arch/x86/ia32/ia32_signal.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/ucontext.h>

#include <asm/uaccess.h>

#include <asm/fpu/internal.h>

#include <asm/fpu/signal.h>

#include <asm/ptrace.h>

#include <asm/ia32_unistd.h>

#include <asm/user32.h>

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

+0 −24
Original line number Diff line number Diff line
@@ -19,21 +19,6 @@ 
#include <asm/fpu/api.h>

#include <asm/fpu/xstate.h>



#ifdef CONFIG_X86_64

# include <asm/sigcontext32.h>

# include <asm/user32.h>

struct ksignal;

int ia32_setup_rt_frame(int sig, struct ksignal *ksig,

			compat_sigset_t *set, struct pt_regs *regs);

int ia32_setup_frame(int sig, struct ksignal *ksig,

		     compat_sigset_t *set, struct pt_regs *regs);

#else

# define user_i387_ia32_struct	user_i387_struct

# define user32_fxsr_struct	user_fxsr_struct

# define ia32_setup_frame	__setup_frame

# define ia32_setup_rt_frame	__setup_rt_frame

#endif



#define	MXCSR_DEFAULT		0x1f80



extern unsigned int mxcsr_feature_mask;
@@ -63,11 +48,6 @@ extern void fpu__resume_cpu(void); 


DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);



extern void convert_from_fxsr(struct user_i387_ia32_struct *env,

			      struct task_struct *tsk);

extern void convert_to_fxsr(struct task_struct *tsk,

			    const struct user_i387_ia32_struct *env);



extern user_regset_active_fn regset_fpregs_active, regset_xregset_fpregs_active;

extern user_regset_get_fn fpregs_get, xfpregs_get, fpregs_soft_get,

				xstateregs_get;
@@ -530,8 +510,4 @@ static inline unsigned short get_fpu_mxcsr(struct task_struct *tsk) 
	}

}



unsigned long

fpu__alloc_mathframe(unsigned long sp, int ia32_frame,

		     unsigned long *buf_fx, unsigned long *size);



#endif /* _ASM_X86_FPU_INTERNAL_H */

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

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * x86 FPU signal frame handling methods:

 */

#ifndef _ASM_X86_FPU_SIGNAL_H

#define _ASM_X86_FPU_SIGNAL_H



#ifdef CONFIG_X86_64

# include <asm/sigcontext32.h>

# include <asm/user32.h>

struct ksignal;

int ia32_setup_rt_frame(int sig, struct ksignal *ksig,

			compat_sigset_t *set, struct pt_regs *regs);

int ia32_setup_frame(int sig, struct ksignal *ksig,

		     compat_sigset_t *set, struct pt_regs *regs);

#else

# define user_i387_ia32_struct	user_i387_struct

# define user32_fxsr_struct	user_fxsr_struct

# define ia32_setup_frame	__setup_frame

# define ia32_setup_rt_frame	__setup_rt_frame

#endif



extern void convert_from_fxsr(struct user_i387_ia32_struct *env,

			      struct task_struct *tsk);

extern void convert_to_fxsr(struct task_struct *tsk,

			    const struct user_i387_ia32_struct *env);



unsigned long

fpu__alloc_mathframe(unsigned long sp, int ia32_frame,

		     unsigned long *buf_fx, unsigned long *size);



#endif /* _ASM_X86_FPU_SIGNAL_H */

arch/x86/kernel/fpu/core.c

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 *	Gareth Hughes <gareth@valinux.com>, May 2000

 */

#include <asm/fpu/internal.h>

#include <asm/fpu/signal.h>



#include <linux/hardirq.h>



/*

arch/x86/kernel/fpu/xstate.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/cpu.h>

#include <asm/fpu/api.h>

#include <asm/fpu/internal.h>

#include <asm/fpu/signal.h>

#include <asm/sigframe.h>

#include <asm/tlbflush.h>