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

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

x86/cpufeature: Remove cpu_has_xmm2 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-crypto@vger.kernel.org
Link: http://lkml.kernel.org/r/1459266123-21878-8-git-send-email-bp@alien8.de


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

arch/x86/crypto/poly1305_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct shash_alg alg = { 


static int __init poly1305_simd_mod_init(void)

{

	if (!cpu_has_xmm2)

	if (!boot_cpu_has(X86_FEATURE_XMM2))

		return -ENODEV;



#ifdef CONFIG_AS_AVX2

arch/x86/crypto/serpent_sse2_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static struct crypto_alg serpent_algs[10] = { { 


static int __init serpent_sse2_init(void)

{

	if (!cpu_has_xmm2) {

	if (!boot_cpu_has(X86_FEATURE_XMM2)) {

		printk(KERN_INFO "SSE2 instructions are not detected.\n");

		return -ENODEV;

	}

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#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_xmm2		boot_cpu_has(X86_FEATURE_XMM2)

#define cpu_has_aes		boot_cpu_has(X86_FEATURE_AES)

#define cpu_has_avx		boot_cpu_has(X86_FEATURE_AVX)

#define cpu_has_avx2		boot_cpu_has(X86_FEATURE_AVX2)

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static void init_amd(struct cpuinfo_x86 *c) 
	if (c->x86 >= 0xf)

		set_cpu_cap(c, X86_FEATURE_K8);



	if (cpu_has_xmm2) {

	if (cpu_has(c, X86_FEATURE_XMM2)) {

		/* MFENCE stops RDTSC speculation */

		set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);

	}

arch/x86/kernel/cpu/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static void init_intel(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);

	}



	if (cpu_has_xmm2)

	if (cpu_has(c, X86_FEATURE_XMM2))

		set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);



	if (boot_cpu_has(X86_FEATURE_DS)) {