The #include <asm/bitops.h> can move to the top of the file now now that generic_f?s() have been untangled.
Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Wei Liu <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Julien Grall <[email protected]> CC: Volodymyr Babchuk <[email protected]> CC: Bertrand Marquis <[email protected]> CC: Michal Orzel <[email protected]> CC: Oleksii Kurochko <[email protected]> CC: Shawn Anastasio <[email protected]> CC: [email protected] <[email protected]> CC: Simone Ballarin <[email protected]> CC: Federico Serafini <[email protected]> CC: Nicola Vetrini <[email protected]> v2: * New --- xen/include/xen/bitops.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index c5518d2c8552..6a5e28730a25 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -4,6 +4,8 @@ #include <xen/compiler.h> #include <xen/types.h> +#include <asm/bitops.h> + /* * Create a contiguous bitmask starting at bit position @l and ending at * position @h. For example GENMASK(30, 21) gives us 0x7fe00000ul. @@ -15,27 +17,13 @@ (((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LLONG - 1 - (h)))) /* - * Find First/Last Set bit. + * Find First/Last Set bit (all forms). * * Bits are labelled from 1. Returns 0 if given 0. */ unsigned int __pure generic_ffsl(unsigned long x); unsigned int __pure generic_flsl(unsigned long x); -/* - * Include this here because some architectures need generic_ffs/fls in - * scope - */ - -/* --------------------- Please tidy above here --------------------- */ - -#include <asm/bitops.h> - -/* - * Find First/Last Set bit (all forms). - * - * Bits are labelled from 1. Returns 0 if given 0. - */ static always_inline __pure unsigned int ffs(unsigned int x) { if ( __builtin_constant_p(x) ) -- 2.30.2
