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 <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Roger Pau Monné <roger....@citrix.com>
CC: Wei Liu <w...@xen.org>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Julien Grall <jul...@xen.org>
CC: Volodymyr Babchuk <volodymyr_babc...@epam.com>
CC: Bertrand Marquis <bertrand.marq...@arm.com>
CC: Michal Orzel <michal.or...@amd.com>
CC: Oleksii Kurochko <oleksii.kuroc...@gmail.com>
CC: Shawn Anastasio <sanasta...@raptorengineering.com>
CC: consult...@bugseng.com <consult...@bugseng.com>
CC: Simone Ballarin <simone.balla...@bugseng.com>
CC: Federico Serafini <federico.seraf...@bugseng.com>
CC: Nicola Vetrini <nicola.vetr...@bugseng.com>
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
