Commit f30cfaca authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov
Browse files

crypto: Convert to new CPU match macros 



The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131510.700250889@linutronix.de
parent d51ba9c6

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);

arch/x86/crypto/ghash-clmulni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static struct ahash_alg ghash_async_alg = { 
};



static const struct x86_cpu_id pcmul_cpu_id[] = {

	X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ), /* Pickle-Mickle-Duck */

	X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL), /* Pickle-Mickle-Duck */

	{}

};

MODULE_DEVICE_TABLE(x86cpu, pcmul_cpu_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE