On 13/03/2024 5:27 pm, Andrew Cooper wrote:
> xen/arch/arm/include/asm/bitops.h | 2 +-
> xen/arch/ppc/include/asm/bitops.h | 1 -
> xen/arch/x86/include/asm/bitops.h | 30 +++++++++++++-----------------
> xen/common/bitops.c | 7 +++++++
> xen/include/xen/bitops.h | 12 ++++++++++++
> 5 files changed, 33 insertions(+), 19 deletions(-)
>
> diff --git a/xen/arch/arm/include/asm/bitops.h
> b/xen/arch/arm/include/asm/bitops.h
> index 09c6064274a7..59ae8ed150b6 100644
> --- a/xen/arch/arm/include/asm/bitops.h
> +++ b/xen/arch/arm/include/asm/bitops.h
> @@ -158,7 +158,7 @@ static inline int fls(unsigned int x)
>
>
> #define arch_ffs(x) ({ unsigned int __t = (x); fls(ISOLATE_LSB(__t)); })
> -#define ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); })
> +#define arch_ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); })
>
> /**
> * find_first_set_bit - find the first set bit in @word
It turns out this change isn't bisectable on ARM, but it is by the end
of the series.
Reordering patches 6+7 to be ahead of this one resolves the bisection
problem.
~Andrew
