Commit 629b3df7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/cpu' into perf/core, to resolve conflict 



Conflicts:
	arch/x86/events/intel/uncore.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3442a9ec d9782807

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1875,7 +1875,6 @@ config X86_SMAP 


config X86_UMIP

	def_bool y

	depends on CPU_SUP_INTEL || CPU_SUP_AMD

	prompt "User Mode Instruction Prevention" if EXPERT

	---help---

	  User Mode Instruction Prevention (UMIP) is a security feature in

arch/x86/crypto/aesni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ static struct aead_alg aesni_aeads[0]; 
static struct simd_aead_alg *aesni_simd_aeads[ARRAY_SIZE(aesni_aeads)];



static const struct x86_cpu_id aesni_cpu_id[] = {

	X86_FEATURE_MATCH(X86_FEATURE_AES),

	X86_MATCH_FEATURE(X86_FEATURE_AES, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, aesni_cpu_id);

arch/x86/crypto/crc32-pclmul_glue.c

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



static const struct x86_cpu_id crc32pclmul_cpu_id[] = {

	X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ),

	X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, crc32pclmul_cpu_id);

arch/x86/crypto/crc32c-intel_glue.c

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



static const struct x86_cpu_id crc32c_cpu_id[] = {

	X86_FEATURE_MATCH(X86_FEATURE_XMM4_2),

	X86_MATCH_FEATURE(X86_FEATURE_XMM4_2, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, crc32c_cpu_id);

arch/x86/crypto/crct10dif-pclmul_glue.c

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



static const struct x86_cpu_id crct10dif_cpu_id[] = {

	X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ),

	X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, crct10dif_cpu_id);