Re: [PATCH, v2] tools: Remove inclusion of ia64-specific version of errno.h header

From: John Paul Adrian Glaubitz
Date: Sun Mar 28 2021 - 03:24:40 EST


Hello!

On 3/23/21 7:04 PM, John Paul Adrian Glaubitz wrote:
> There is no longer an ia64-specific version of the errno.h header
> below arch/ia64/include/uapi/asm/, so trying to build tools/bpf
> fails with:
>
> CC /usr/src/linux/tools/bpf/bpftool/btf_dumper.o
> In file included from /usr/src/linux/tools/include/linux/err.h:8,
> from btf_dumper.c:11:
> /usr/src/linux/tools/include/uapi/asm/errno.h:13:10: fatal error: ../../../arch/ia64/include/uapi/asm/errno.h: No such file or directory
> 13 | #include "../../../arch/ia64/include/uapi/asm/errno.h"
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> compilation terminated.
>
> Thus, just remove the inclusion of the ia64-specific errno.h so that
> the build will use the generic errno.h header on this target which was
> used there anyway as the ia64-specific errno.h was just a wrapper for
> the generic header.
>
> Fixes: c25f867ddd00 ("ia64: remove unneeded uapi asm-generic wrappers")
> Signed-off-by: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
> ---
> tools/include/uapi/asm/errno.h | 2 --
> 1 file changed, 2 deletions(-)
>
> v2:
> - Rephrase summary
>
> diff --git a/tools/include/uapi/asm/errno.h b/tools/include/uapi/asm/errno.h
> index 637189ec1ab9..d30439b4b8ab 100644
> --- a/tools/include/uapi/asm/errno.h
> +++ b/tools/include/uapi/asm/errno.h
> @@ -9,8 +9,6 @@
> #include "../../../arch/alpha/include/uapi/asm/errno.h"
> #elif defined(__mips__)
> #include "../../../arch/mips/include/uapi/asm/errno.h"
> -#elif defined(__ia64__)
> -#include "../../../arch/ia64/include/uapi/asm/errno.h"
> #elif defined(__xtensa__)
> #include "../../../arch/xtensa/include/uapi/asm/errno.h"
> #else
>

Shall I ask Andrew Morton to pick up this patch? It's needed to fix the Debian
kernel build on ia64 and it would be great if it could be included for 5.12.

Adrian

--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@xxxxxxxxxx
`. `' Freie Universitaet Berlin - glaubitz@xxxxxxxxxxxxxxxxxxx
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913