[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20210406183625.794227-1-yury.norov@gmail.com>
Date: Tue, 6 Apr 2021 11:36:25 -0700
From: Yury Norov <yury.norov@...il.com>
To: Yoshinori Sato <ysato@...rs.sourceforge.jp>,
linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org,
uclinux-h8-devel@...ts.sourceforge.jp,
Andrew Morton <akpm@...ux-foundation.org>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Arnd Bergmann <arnd@...db.de>,
Rasmus Villemoes <linux@...musvillemoes.dk>,
Guenter Roeck <linux@...ck-us.net>
Cc: Yury Norov <yury.norov@...il.com>,
kernel test robot <lkp@...el.com>
Subject: [PATCH v2] 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 <lkp@...el.com>
Reported-by: Guenter Roeck <linux@...ck-us.net>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Signed-off-by: Yury Norov <yury.norov@...il.com>
---
arch/h8300/include/asm/bitops.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/h8300/include/asm/bitops.h b/arch/h8300/include/asm/bitops.h
index 7aa16c732aa9..c867a80cab5b 100644
--- a/arch/h8300/include/asm/bitops.h
+++ b/arch/h8300/include/asm/bitops.h
@@ -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 */
--
2.25.1
Powered by blists - more mailing lists