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

Commit dda9edf7 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Replace cpu_has_xmm with boot_cpu_has() usage 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459801503-15600-5-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent da154e82

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#define cpu_has_tsc		boot_cpu_has(X86_FEATURE_TSC)

#define cpu_has_apic		boot_cpu_has(X86_FEATURE_APIC)

#define cpu_has_fxsr		boot_cpu_has(X86_FEATURE_FXSR)

#define cpu_has_xmm		boot_cpu_has(X86_FEATURE_XMM)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

/*

arch/x86/include/asm/xor_32.h

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static struct xor_block_template xor_block_pIII_sse = { 
#define XOR_TRY_TEMPLATES				\

do {							\

	AVX_XOR_SPEED;					\

	if (cpu_has_xmm) {				\

	if (boot_cpu_has(X86_FEATURE_XMM)) {				\

		xor_speed(&xor_block_pIII_sse);		\

		xor_speed(&xor_block_sse_pf64);		\

	} else if (boot_cpu_has(X86_FEATURE_MMX)) {	\

arch/x86/kernel/fpu/core.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static inline unsigned short get_fpu_swd(struct fpu *fpu) 


static inline unsigned short get_fpu_mxcsr(struct fpu *fpu)

{

	if (cpu_has_xmm) {

	if (boot_cpu_has(X86_FEATURE_XMM)) {

		return fpu->state.fxsave.mxcsr;

	} else {

		return MXCSR_DEFAULT;

arch/x86/kernel/fpu/init.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void fpu__init_cpu_generic(void) 


	if (cpu_has_fxsr)

		cr4_mask |= X86_CR4_OSFXSR;

	if (cpu_has_xmm)

	if (boot_cpu_has(X86_FEATURE_XMM))

		cr4_mask |= X86_CR4_OSXMMEXCPT;

	if (cr4_mask)

		cr4_set_bits(cr4_mask);