Re: [PATCH v6 01/24] arm64: Remove unused daif related functions/macros

From: Mark Rutland
Date: Thu Nov 29 2018 - 11:26:46 EST


On Mon, Nov 12, 2018 at 11:56:52AM +0000, Julien Thierry wrote:
> There are some helpers to modify PSR.[DAIF] bits that are not referenced
> anywhere. The less these bits are available outside of local_irq_*
> functions the better.
>
> Get rid of those unused helpers.
>
> Signed-off-by: Julien Thierry <julien.thierry@xxxxxxx>
> Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
> Cc: Will Deacon <will.deacon@xxxxxxx>
> Cc: James Morse <james.morse@xxxxxxx>

Reviewed-by: Mark Rutland <mark.rutland@xxxxxxx>

Mark.

> ---
> arch/arm64/include/asm/assembler.h | 10 +---------
> arch/arm64/include/asm/daifflags.h | 10 ----------
> 2 files changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
> index 6142402..6e76c8e 100644
> --- a/arch/arm64/include/asm/assembler.h
> +++ b/arch/arm64/include/asm/assembler.h
> @@ -60,16 +60,8 @@
> .endm
>
> /*
> - * Enable and disable interrupts.
> + * Save/restore interrupts.
> */
> - .macro disable_irq
> - msr daifset, #2
> - .endm
> -
> - .macro enable_irq
> - msr daifclr, #2
> - .endm
> -
> .macro save_and_disable_irq, flags
> mrs \flags, daif
> msr daifset, #2
> diff --git a/arch/arm64/include/asm/daifflags.h b/arch/arm64/include/asm/daifflags.h
> index 8d91f22..546bc39 100644
> --- a/arch/arm64/include/asm/daifflags.h
> +++ b/arch/arm64/include/asm/daifflags.h
> @@ -43,16 +43,6 @@ static inline unsigned long local_daif_save(void)
> return flags;
> }
>
> -static inline void local_daif_unmask(void)
> -{
> - trace_hardirqs_on();
> - asm volatile(
> - "msr daifclr, #0xf // local_daif_unmask"
> - :
> - :
> - : "memory");
> -}
> -
> static inline void local_daif_restore(unsigned long flags)
> {
> if (!arch_irqs_disabled_flags(flags))
> --
> 1.9.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel