Commit 0ae67cc3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov
Browse files

x86/fpu: Remove internal.h dependency from fpu/signal.h 



In order to remove internal.h make signal.h independent of it.

Include asm/fpu/xstate.h to fix a missing update_regset_xstate_info()
prototype, which is
Reported-by: default avatarkernel test robot <lkp@intel.com>

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20211015011539.844565975@linutronix.de
parent 90489f1d

arch/x86/ia32/ia32_signal.c

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

#include <asm/ucontext.h>

#include <linux/uaccess.h>

#include <asm/fpu/internal.h>

#include <asm/fpu/signal.h>

#include <asm/ptrace.h>

#include <asm/ia32_unistd.h>

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

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ extern void fpstate_init_soft(struct swregs_state *soft); 
static inline void fpstate_init_soft(struct swregs_state *soft) {}

#endif



/* State tracking */

DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);



/* fpstate */

extern union fpregs_state init_fpstate;

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

+0 −7
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
/*

 * High level FPU state handling functions:

 */

extern bool fpu__restore_sig(void __user *buf, int ia32_frame);

extern void fpu__clear_user_states(struct fpu *fpu);

extern int  fpu__exception_code(struct fpu *fpu, int trap_nr);
@@ -42,10 +41,4 @@ extern void fpu__init_system(struct cpuinfo_x86 *c); 
extern void fpu__init_check_bugs(void);

extern void fpu__resume_cpu(void);



extern void restore_fpregs_from_fpstate(union fpregs_state *fpstate, u64 mask);



extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);



DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);



#endif /* _ASM_X86_FPU_INTERNAL_H */

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

+13 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ 
#ifndef _ASM_X86_FPU_SIGNAL_H

#define _ASM_X86_FPU_SIGNAL_H



#include <linux/compat.h>

#include <linux/user.h>



#include <asm/fpu/types.h>



#ifdef CONFIG_X86_64

# include <uapi/asm/sigcontext.h>

# include <asm/user32.h>
@@ -31,4 +36,12 @@ fpu__alloc_mathframe(unsigned long sp, int ia32_frame, 


unsigned long fpu__get_fpstate_size(void);



extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);

extern void fpu__clear_user_states(struct fpu *fpu);

extern bool fpu__restore_sig(void __user *buf, int ia32_frame);



extern void restore_fpregs_from_fpstate(union fpregs_state *fpstate, u64 mask);



extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);



#endif /* _ASM_X86_FPU_SIGNAL_H */

arch/x86/kernel/fpu/signal.c

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

#include <linux/pagemap.h>



#include <asm/fpu/internal.h>

#include <asm/fpu/signal.h>

#include <asm/fpu/regset.h>

#include <asm/fpu/xstate.h>