diff mbox series

[v2] arm64: armv8_deprecated: fix unused-function error

Message ID 20221124022429.19024-1-renzhijie2@huawei.com
State New
Headers
Series [v2] arm64: armv8_deprecated: fix unused-function error |

Commit Message

Ren Zhijie Nov. 24, 2022, 2:24 a.m. UTC 
  If CONFIG_SWP_EMULATION is not set and
CONFIG_CP15_BARRIER_EMULATION is not set,
aarch64-linux-gnu complained about unused-function :

arch/arm64/kernel/armv8_deprecated.c:67:21: error: ‘aarch32_check_condition’ defined but not used [-Werror=unused-function]
 static unsigned int aarch32_check_condition(u32 opcode, u32 psr)
                     ^~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

To fix this warning, modify aarch32_check_condition() with __maybe_unused.

Fixes: 0c5f416219da ("arm64: armv8_deprecated: move aarch32 helper earlier")
Signed-off-by: Ren Zhijie <renzhijie2@huawei.com>
---
Changes in v2:
- modify aarch32_check_condition() with __maybe_unused.

 arch/arm64/kernel/armv8_deprecated.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Rutland Nov. 24, 2022, 10:47 a.m. UTC | #1 
On Thu, Nov 24, 2022 at 02:24:29AM +0000, Ren Zhijie wrote:
> If CONFIG_SWP_EMULATION is not set and
> CONFIG_CP15_BARRIER_EMULATION is not set,
> aarch64-linux-gnu complained about unused-function :
> 
> arch/arm64/kernel/armv8_deprecated.c:67:21: error: ‘aarch32_check_condition’ defined but not used [-Werror=unused-function]
>  static unsigned int aarch32_check_condition(u32 opcode, u32 psr)
>                      ^~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> To fix this warning, modify aarch32_check_condition() with __maybe_unused.
> 
> Fixes: 0c5f416219da ("arm64: armv8_deprecated: move aarch32 helper earlier")
> Signed-off-by: Ren Zhijie <renzhijie2@huawei.com>

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
> Changes in v2:
> - modify aarch32_check_condition() with __maybe_unused.
> 
>  arch/arm64/kernel/armv8_deprecated.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
> index ed0788cf6bbb..8a9052cf3013 100644
> --- a/arch/arm64/kernel/armv8_deprecated.c
> +++ b/arch/arm64/kernel/armv8_deprecated.c
> @@ -64,7 +64,7 @@ struct insn_emulation {
>  
>  #define	ARM_OPCODE_CONDITION_UNCOND	0xf
>  
> -static unsigned int aarch32_check_condition(u32 opcode, u32 psr)
> +static unsigned int __maybe_unused aarch32_check_condition(u32 opcode, u32 psr)
>  {
>  	u32 cc_bits  = opcode >> 28;
>  
> -- 
> 2.17.1
>
Will Deacon Nov. 25, 2022, 1:24 p.m. UTC | #2 
On Thu, 24 Nov 2022 02:24:29 +0000, Ren Zhijie wrote:
> If CONFIG_SWP_EMULATION is not set and
> CONFIG_CP15_BARRIER_EMULATION is not set,
> aarch64-linux-gnu complained about unused-function :
> 
> arch/arm64/kernel/armv8_deprecated.c:67:21: error: ‘aarch32_check_condition’ defined but not used [-Werror=unused-function]
>  static unsigned int aarch32_check_condition(u32 opcode, u32 psr)
>                      ^~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> [...]

Applied to arm64 (for-next/undef-traps), thanks!

[1/1] arm64: armv8_deprecated: fix unused-function error
      https://git.kernel.org/arm64/c/223d3a0d30b6

Cheers,
diff mbox series

Patch

diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
index ed0788cf6bbb..8a9052cf3013 100644
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@ -64,7 +64,7 @@  struct insn_emulation {
 
 #define	ARM_OPCODE_CONDITION_UNCOND	0xf
 
-static unsigned int aarch32_check_condition(u32 opcode, u32 psr)
+static unsigned int __maybe_unused aarch32_check_condition(u32 opcode, u32 psr)
 {
 	u32 cc_bits  = opcode >> 28;