Commit 5fd402df authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu/xstate: Clean up setup_xstate_comp() call 



So call setup_xstate_comp() from the xstate init code, not
from the generic fpu__init_system() code.

This allows us to remove the protytype from xstate.h as well.

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 489e9c01

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

+0 −1
Original line number Diff line number Diff line
@@ -227,6 +227,5 @@ static inline int copy_user_to_xregs(struct xregs_state __user *buf, u64 mask) 
}



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

void setup_xstate_comp(void);



#endif

arch/x86/kernel/fpu/init.c

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ void fpu__init_system(struct cpuinfo_x86 *c) 
	fpu__init_system_generic();

	fpu__init_system_xstate_size_legacy();

	fpu__init_system_xstate();

	setup_xstate_comp();



	fpu__init_system_ctx_switch();

}

arch/x86/kernel/fpu/xstate.c

+2 −4
Original line number Diff line number Diff line
@@ -218,11 +218,8 @@ static void print_xstate_features(void) 
 * This function sets up offsets and sizes of all extended states in

 * xsave area. This supports both standard format and compacted format

 * of the xsave aread.

 *

 * Input: void

 * Output: void

 */

void setup_xstate_comp(void)

static void setup_xstate_comp(void)

{

	unsigned int xstate_comp_sizes[sizeof(xfeatures_mask)*8];

	int i;
@@ -355,6 +352,7 @@ void fpu__init_system_xstate(void) 
	update_regset_xstate_info(xstate_size, xfeatures_mask);

	fpu__init_prepare_fx_sw_frame();

	setup_init_fpu_buf();

	setup_xstate_comp();



	pr_info("x86/fpu: Enabled xstate features 0x%llx, context size is 0x%x bytes, using '%s' format.\n",

		xfeatures_mask,

CRA Git | Maintained and supported by SUSTech CRA and CCSE