Commit 7891bc0a authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

x86/fpu: Inline fpu__xstate_clear_all_cpu_caps() 



All fpu__xstate_clear_all_cpu_caps() does is to invoke one simple
function since commit

  73e3a7d2 ("x86/fpu: Remove the explicit clearing of XSAVE dependent features")

so invoke that function directly and remove the wrapper.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190704060743.rvew4yrjd6n33uzx@linutronix.de
parent 9838e3bf

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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ extern u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS]; 
extern void __init update_regset_xstate_info(unsigned int size,

					     u64 xstate_mask);



void fpu__xstate_clear_all_cpu_caps(void);

void *get_xsave_addr(struct xregs_state *xsave, int xfeature_nr);

const void *get_xsave_field_ptr(int xfeature_nr);

int using_compacted_format(void);

arch/x86/kernel/fpu/init.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void __init fpu__init_parse_early_param(void) 
#endif



	if (cmdline_find_option_bool(boot_command_line, "noxsave"))

		fpu__xstate_clear_all_cpu_caps();

		setup_clear_cpu_cap(X86_FEATURE_XSAVE);



	if (cmdline_find_option_bool(boot_command_line, "noxsaveopt"))

		setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);

arch/x86/kernel/fpu/xstate.c

+1 −10
Original line number Diff line number Diff line
@@ -67,15 +67,6 @@ static unsigned int xstate_comp_offsets[sizeof(xfeatures_mask)*8]; 
 */

unsigned int fpu_user_xstate_size;



/*

 * Clear all of the X86_FEATURE_* bits that are unavailable

 * when the CPU has no XSAVE support.

 */

void fpu__xstate_clear_all_cpu_caps(void)

{

	setup_clear_cpu_cap(X86_FEATURE_XSAVE);

}



/*

 * Return whether the system supports a given xfeature.

 *
@@ -709,7 +700,7 @@ static void fpu__init_disable_system_xstate(void) 
{

	xfeatures_mask = 0;

	cr4_clear_bits(X86_CR4_OSXSAVE);

	fpu__xstate_clear_all_cpu_caps();

	setup_clear_cpu_cap(X86_FEATURE_XSAVE);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE