The macros wouldn't work in all assembler flavors for reasons described
in the comments on top of declarations. Enforce it for more by adding
!__ASSEMBLY__ guard.

Signed-off-by: Yury Norov <yury.norov@gmail.com>
---
 include/linux/bits.h       | 2 ++
 include/uapi/linux/const.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/include/linux/bits.h b/include/linux/bits.h
index bf99feb5570e..60044b608817 100644
--- a/include/linux/bits.h
+++ b/include/linux/bits.h
@@ -36,6 +36,7 @@
 #define GENMASK_ULL(h, l) \
 	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))
 
+#if !defined(__ASSEMBLY__)
 /*
  * Missing asm support
  *
@@ -48,5 +49,6 @@
  */
 #define GENMASK_U128(h, l) \
 	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_U128(h, l))
+#endif
 
 #endif	/* __LINUX_BITS_H */
diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h
index 5be12e8f8f9c..e16be0d37746 100644
--- a/include/uapi/linux/const.h
+++ b/include/uapi/linux/const.h
@@ -28,6 +28,7 @@
 #define _BITUL(x)	(_UL(1) << (x))
 #define _BITULL(x)	(_ULL(1) << (x))
 
+#if !defined(__ASSEMBLY__)
 /*
  * Missing asm support
  *
@@ -42,6 +43,7 @@
  * GENMASK_U128() which would then start supporting asm code.
  */
 #define _BIT128(x)	((unsigned __int128)(1) << (x))
+#endif
 
 #define __ALIGN_KERNEL(x, a)		__ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)
 #define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
-- 
2.43.0

On 8/3/24 19:07, Yury Norov wrote:
> The macros wouldn't work in all assembler flavors for reasons described
> in the comments on top of declarations. Enforce it for more by adding
> !__ASSEMBLY__ guard.

Right, this makes sense, should have added in the original patch itself.

> 
> Signed-off-by: Yury Norov <yury.norov@gmail.com>

Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>

> ---
>  include/linux/bits.h       | 2 ++
>  include/uapi/linux/const.h | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/include/linux/bits.h b/include/linux/bits.h
> index bf99feb5570e..60044b608817 100644
> --- a/include/linux/bits.h
> +++ b/include/linux/bits.h
> @@ -36,6 +36,7 @@
>  #define GENMASK_ULL(h, l) \
>  	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))
>  
> +#if !defined(__ASSEMBLY__)
>  /*
>   * Missing asm support
>   *
> @@ -48,5 +49,6 @@
>   */
>  #define GENMASK_U128(h, l) \
>  	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_U128(h, l))
> +#endif
>  
>  #endif	/* __LINUX_BITS_H */
> diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h
> index 5be12e8f8f9c..e16be0d37746 100644
> --- a/include/uapi/linux/const.h
> +++ b/include/uapi/linux/const.h
> @@ -28,6 +28,7 @@
>  #define _BITUL(x)	(_UL(1) << (x))
>  #define _BITULL(x)	(_ULL(1) << (x))
>  
> +#if !defined(__ASSEMBLY__)
>  /*
>   * Missing asm support
>   *
> @@ -42,6 +43,7 @@
>   * GENMASK_U128() which would then start supporting asm code.
>   */
>  #define _BIT128(x)	((unsigned __int128)(1) << (x))
> +#endif
>  
>  #define __ALIGN_KERNEL(x, a)		__ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)
>  #define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))