h8300: rearrange headers inclusion order in asm/bitops

The commit a5145bdad3ff ("arch: rearrange headers inclusion order in asm/bitops for m68k and sh") on next-20210401 fixed header ordering issue. h8300 has similar problem, which was overlooked by me.

h8300 includes bitmap/{find,le}.h prior to ffs/fls headers. New fast-path implementation in find.h requires ffs/fls. Reordering the headers inclusion sequence helps to prevent compile-time implicit function declaration error.

v2: change wording in the comment.

Reported-by kernel test robot <[email protected]>

Reported-by Guenter Roeck <[email protected]>

Reviewed-by Andy Shevchenko <[email protected]>

Signed-off-by Yury Norov <[email protected]>

---
 arch/h8300/include/asm/bitops.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

arch/h8300/include/asm/bitops.h +4 -4

index 7aa16c732aa9..c867a80cab5b 100644
@@ -9,6 +9,10 @@
 
 #include <linux/compiler.h>
 
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
+#include <asm-generic/bitops/fls64.h>
+
 #ifdef __KERNEL__
 
 #ifndef _LINUX_BITOPS_H

@@ -173,8 +177,4 @@ static inline unsigned long __ffs(unsigned long word)
 
 #endif /* __KERNEL__ */
 
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/__fls.h>
-#include <asm-generic/bitops/fls64.h>
-
 #endif /* _H8300_BITOPS_H */

Signature · 1 line

2.25.1