[PATCH v3 2/2] arm64: Unconditionally override SYM_FUNC macros

Will Deacon will at kernel.org
Mon Dec 13 10:46:54 PST 2021


On Wed, Dec 08, 2021 at 04:08:19PM +0000, Mark Brown wrote:
> Currently we only override the SYM_FUNC macros when we need to insert
> BTI C into them.  Since we now unconditionally provide the BTI_C macro
> used to do that let's always override them, that way any issues with our
> overrides it'll show up more consistently.
> 
> Since this means that we now have an unconditional definition of BTI_C
> update the other users to remove the ifdefs around usage, making them
> look a bit neater.
> 
> Suggested-by: Mark Rutland <mark.rutland at arm.com>
> Signed-off-by: Mark Brown <broonie at kernel.org>
> ---
>  arch/arm64/include/asm/linkage.h | 16 +++++++++++-----
>  arch/arm64/kernel/entry-ftrace.S |  4 ----
>  arch/arm64/lib/kasan_sw_tags.S   |  2 --
>  3 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h
> index c5d0c11d7709..1cfa8bb33edd 100644
> --- a/arch/arm64/include/asm/linkage.h
> +++ b/arch/arm64/include/asm/linkage.h
> @@ -8,10 +8,18 @@
>  
>  #define BTI_C bti c ;
>  
> +#else
> +
> +#define BTI_C
> +
> +#endif

Why do we need this hunk? Having the hint instruction should be fine, no?

Will



More information about the linux-arm-kernel mailing list