diff mbox series

[1/2] arm64: Remove enable_daif macro

Message ID 20240229132802.1682026-2-ruanjinjie@huawei.com (mailing list archive)
State New, archived
Headers show
Series arm64: Remove enable_daif macro and rename disable_daif | expand

Commit Message

Jinjie Ruan Feb. 29, 2024, 1:28 p.m. UTC
Since commit bb8e93a287a5 ("arm64: entry: convert SError handlers to C"),
the enable_daif assembler macro is no longer used anywhere, so remove it.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 arch/arm64/include/asm/assembler.h | 4 ----
 1 file changed, 4 deletions(-)

Comments

Mark Brown Feb. 29, 2024, 1:35 p.m. UTC | #1
On Thu, Feb 29, 2024 at 09:28:01PM +0800, Jinjie Ruan wrote:
> Since commit bb8e93a287a5 ("arm64: entry: convert SError handlers to C"),
> the enable_daif assembler macro is no longer used anywhere, so remove it.

Good spot!

Reviewed-by: Mark Brown <broonie@kernel.org>
Mark Rutland Feb. 29, 2024, 2:30 p.m. UTC | #2
On Thu, Feb 29, 2024 at 09:28:01PM +0800, Jinjie Ruan wrote:
> Since commit bb8e93a287a5 ("arm64: entry: convert SError handlers to C"),
> the enable_daif assembler macro is no longer used anywhere, so remove it.
> 
> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
> ---
>  arch/arm64/include/asm/assembler.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
> index ce7b95cd6e79..ab8b396428da 100644
> --- a/arch/arm64/include/asm/assembler.h
> +++ b/arch/arm64/include/asm/assembler.h
> @@ -38,10 +38,6 @@
>  	msr	daifset, #0xf
>  	.endm
>  
> -	.macro enable_daif
> -	msr	daifclr, #0xf
> -	.endm
> -

I have no strong feelings either way on this; I had been waiting to remove this
along with disable_daif, but removing the latter requires some more substantial
work.

FWIW, for this as-is:

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

Mark.

>  /*
>   * Save/restore interrupts.
>   */
> -- 
> 2.34.1
>
diff mbox series

Patch

diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index ce7b95cd6e79..ab8b396428da 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -38,10 +38,6 @@ 
 	msr	daifset, #0xf
 	.endm
 
-	.macro enable_daif
-	msr	daifclr, #0xf
-	.endm
-
 /*
  * Save/restore interrupts.
  */