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

Commit cb44d0cf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/cpu' into x86/asm, to merge more patches 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 482dd2ef d7847a70

arch/ia64/include/asm/iommu.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _ASM_IA64_IOMMU_H

#define _ASM_IA64_IOMMU_H 1



#define cpu_has_x2apic 0

/* 10 seconds */

#define DMAR_OPERATION_TIMEOUT (((cycles_t) local_cpu_data->itc_freq)*10)

arch/nios2/kernel/prom.c

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ static int __init early_init_dt_scan_serial(unsigned long node, 
		return 0;

#endif



	*addr64 = fdt_translate_address((const void *)initial_boot_params,

		node);

	*addr64 = of_flat_dt_translate_address(node);



	return *addr64 == OF_BAD_ADDR ? 0 : 1;

}

arch/x86/crypto/camellia_aesni_avx2_glue.c

+2 −1
Original line number Diff line number Diff line
@@ -562,7 +562,8 @@ static int __init camellia_aesni_init(void) 
{

	const char *feature_name;



	if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) {

	if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

		pr_info("AVX2 or AES-NI instructions are not detected.\n");

		return -ENODEV;

	}

arch/x86/crypto/camellia_aesni_avx_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int __init camellia_aesni_init(void) 
{

	const char *feature_name;



	if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) {

	if (!cpu_has_avx || !cpu_has_aes || !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

		pr_info("AVX or AES-NI instructions are not detected.\n");

		return -ENODEV;

	}

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