On Wed, Nov 22, 2023 at 4:32 PM Sasha Levin <sashal@xxxxxxxxxx> wrote:
>
> From: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
>
> [ Upstream commit 9e0be3f50c0e8517d0238b62409c20bcb8cd8785 ]
>
> With commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture"),
> there is no need to keep the IA-64 definition of the KSYM_FUNC macro.
>
> Clean up the IA-64 definition of the KSYM_FUNC macro.
>
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
> Reviewed-by: Nathan Chancellor <nathan@xxxxxxxxxx>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
I am a bit surprised that this is picked up for v6.6. This commit only
makes sense after IA-64 architecture is removed and I do not think we
want to backport that change to v6.6. So, this change here should not
be backported as well.
Lukas
> include/linux/export-internal.h | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/include/linux/export-internal.h b/include/linux/export-internal.h
> index 45fca09b23194..69501e0ec239f 100644
> --- a/include/linux/export-internal.h
> +++ b/include/linux/export-internal.h
> @@ -50,9 +50,7 @@
> " .previous" "\n" \
> )
>
> -#ifdef CONFIG_IA64
> -#define KSYM_FUNC(name) @fptr(name)
> -#elif defined(CONFIG_PARISC) && defined(CONFIG_64BIT)
> +#if defined(CONFIG_PARISC) && defined(CONFIG_64BIT)
> #define KSYM_FUNC(name) P%name
> #else
> #define KSYM_FUNC(name) name
> --
> 2.42.0
>
