On 15.01.2025 16:03, Andrew Cooper wrote:
> public/arch-ppc.h contains two adjacent #ifndef __ASSEMBLY__ blocks.
>
> With these merged, it becomes very obvious that there's a duplicate
> definition of xen_ulong_t, which is also noticed by the docs build:
>
> /usr/bin/perl -w /local/xen.git/docs/xen-headers -O html/hypercall/ppc \
> -T 'arch-ppc - Xen public headers' \
> -X arch-arm -X arch-riscv -X arch-x86_32 -X arch-x86_64 \
> -X xen-arm -X xen-riscv -X xen-x86_32 -X xen-x86_64 \
> -X arch-x86 \
> /local/xen.git/docs/../xen include/public include/xen/errno.h
> include/public/memory.h:63: multiple definitions of Typedef xen_ulong_t:
> include/public/arch-ppc.h:55
> include/public/memory.h:63: multiple definitions of Typedef xen_ulong_t:
> include/public/arch-ppc.h:61
> include/public/memory.h:63: multiple definitions of Typedef xen_ulong_t:
> include/public/arch-ppc.h:61
> include/public/memory.h:63: multiple definitions of Typedef xen_ulong_t:
> include/public/arch-ppc.h:55
>
> Drop the second typedef. Finally, annotate the #endif so it's clear
> what it refers to.
>
> Fixes: 08c192cc1127 ("xen/ppc: Add public/arch-ppc.h")
> Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
Reviewed-by: Jan Beulich <jbeul...@suse.com>
