2022-11-10 10:48:01

by Tianjia Zhang

Subject: [PATCH] crypto: arm64 - Fix unused variable compilation warnings of cpu_feature

The cpu feature defined by MODULE_DEVICE_TABLE is only referenced when
compiling as a module, and the warning of unused variable will be
encountered when compiling with intree. The warning can be removed by
adding the __maybe_unused flag.

Fixes: 03c9a333fef1 ("crypto: arm64/ghash - add NEON accelerated fallback for 64-bit PMULL")
Fixes: ae1b83c7d572 ("crypto: arm64/sm4 - add CE implementation for GCM mode")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Tianjia Zhang <[email protected]>
---
arch/arm64/crypto/ghash-ce-glue.c | 2 +-
arch/arm64/crypto/sm4-ce-gcm-glue.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c
index 15794fe21a0b..e5e9adc1fcf4 100644
--- a/arch/arm64/crypto/ghash-ce-glue.c
+++ b/arch/arm64/crypto/ghash-ce-glue.c
@@ -508,7 +508,7 @@ static void __exit ghash_ce_mod_exit(void)
crypto_unregister_shash(&ghash_alg);
}

-static const struct cpu_feature ghash_cpu_feature[] = {
+static const struct cpu_feature __maybe_unused ghash_cpu_feature[] = {
{ cpu_feature(PMULL) }, { }
};
MODULE_DEVICE_TABLE(cpu, ghash_cpu_feature);
diff --git a/arch/arm64/crypto/sm4-ce-gcm-glue.c b/arch/arm64/crypto/sm4-ce-gcm-glue.c
index e90ea0f17beb..c450a2025ca9 100644
--- a/arch/arm64/crypto/sm4-ce-gcm-glue.c
+++ b/arch/arm64/crypto/sm4-ce-gcm-glue.c
@@ -271,7 +271,7 @@ static void __exit sm4_ce_gcm_exit(void)
crypto_unregister_aead(&sm4_gcm_alg);
}

-static const struct cpu_feature sm4_ce_gcm_cpu_feature[] = {
+static const struct cpu_feature __maybe_unused sm4_ce_gcm_cpu_feature[] = {
{ cpu_feature(PMULL) },
{}
};
--
2.24.3 (Apple Git-128)

2022-11-18 09:20:11

by Herbert Xu

Subject: Re: [PATCH] crypto: arm64 - Fix unused variable compilation warnings of cpu_feature

On Thu, Nov 10, 2022 at 06:42:04PM +0800, Tianjia Zhang wrote:
> The cpu feature defined by MODULE_DEVICE_TABLE is only referenced when
> compiling as a module, and the warning of unused variable will be
> encountered when compiling with intree. The warning can be removed by
> adding the __maybe_unused flag.
>
> Fixes: 03c9a333fef1 ("crypto: arm64/ghash - add NEON accelerated fallback for 64-bit PMULL")
> Fixes: ae1b83c7d572 ("crypto: arm64/sm4 - add CE implementation for GCM mode")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Tianjia Zhang <[email protected]>
> ---
> arch/arm64/crypto/ghash-ce-glue.c | 2 +-
> arch/arm64/crypto/sm4-ce-gcm-glue.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt