| Message ID | 20210121000630.371883-2-yury.norov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | lib/find_bit: fast path for small bitmaps | expand |
On Thu, Jan 21, 2021 at 1:06 AM Yury Norov <yury.norov@gmail.com> wrote: > m68k and sh include bitmap/find.h prior to ffs/fls headers. New > fast-path implementation in find.h requires ffs/fls. Reordering > the order of headers inclusion helps to prevent compile-time > implicit-function-declaration error. > > Signed-off-by: Yury Norov <yury.norov@gmail.com> > --- > arch/m68k/include/asm/bitops.h | 4 ++-- Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Gr{oetje,eeting}s, Geert
Hi Yury! On 1/21/21 1:06 AM, Yury Norov wrote: > m68k and sh include bitmap/find.h prior to ffs/fls headers. New > fast-path implementation in find.h requires ffs/fls. Reordering > the order of headers inclusion helps to prevent compile-time > implicit-function-declaration error. Can you fix the commit message? "arch: rearrahge headers inclusion order in asm/bitops for m68k and sh" ^^^^^^^^^ rearrange Adrian
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 10133a968c8e..093590c9e70f 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -440,8 +440,6 @@ static inline unsigned long ffz(unsigned long word) #endif -#include <asm-generic/bitops/find.h> - #ifdef __KERNEL__ #if defined(CONFIG_CPU_HAS_NO_BITFIELDS) @@ -531,4 +529,6 @@ static inline int __fls(int x) #include <asm-generic/bitops/hweight.h> #endif /* __KERNEL__ */ +#include <asm-generic/bitops/find.h> + #endif /* _M68K_BITOPS_H */ diff --git a/arch/sh/include/asm/bitops.h b/arch/sh/include/asm/bitops.h index 450b5854d7c6..792bbe1237dc 100644 --- a/arch/sh/include/asm/bitops.h +++ b/arch/sh/include/asm/bitops.h @@ -58,7 +58,6 @@ static inline unsigned long __ffs(unsigned long word) return result; } -#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/ffs.h> #include <asm-generic/bitops/hweight.h> #include <asm-generic/bitops/lock.h> @@ -69,4 +68,6 @@ static inline unsigned long __ffs(unsigned long word) #include <asm-generic/bitops/__fls.h> #include <asm-generic/bitops/fls64.h> +#include <asm-generic/bitops/find.h> + #endif /* __ASM_SH_BITOPS_H */
m68k and sh include bitmap/find.h prior to ffs/fls headers. New fast-path implementation in find.h requires ffs/fls. Reordering the order of headers inclusion helps to prevent compile-time implicit-function-declaration error. Signed-off-by: Yury Norov <yury.norov@gmail.com> --- arch/m68k/include/asm/bitops.h | 4 ++-- arch/sh/include/asm/bitops.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)