lkml.org 
[lkml]   [2021]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/12] arch: rearrange headers inclusion order in asm/bitops for m68k and sh
    Date
    m68k and sh include 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.

    Signed-off-by: Yury Norov <yury.norov@gmail.com>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
    ---
    arch/m68k/include/asm/bitops.h | 6 +++---
    arch/sh/include/asm/bitops.h | 5 +++--
    2 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
    index 10133a968c8e..7b414099e5fc 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)
    @@ -525,10 +523,12 @@ static inline int __fls(int x)
    #define __clear_bit_unlock clear_bit_unlock

    #include <asm-generic/bitops/ext2-atomic.h>
    -#include <asm-generic/bitops/le.h>
    #include <asm-generic/bitops/fls64.h>
    #include <asm-generic/bitops/sched.h>
    #include <asm-generic/bitops/hweight.h>
    +#include <asm-generic/bitops/le.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..3b6c7b5b7ec9 100644
    --- a/arch/sh/include/asm/bitops.h
    +++ b/arch/sh/include/asm/bitops.h
    @@ -58,15 +58,16 @@ 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>
    #include <asm-generic/bitops/sched.h>
    -#include <asm-generic/bitops/le.h>
    #include <asm-generic/bitops/ext2-atomic.h>
    #include <asm-generic/bitops/fls.h>
    #include <asm-generic/bitops/__fls.h>
    #include <asm-generic/bitops/fls64.h>

    +#include <asm-generic/bitops/le.h>
    +#include <asm-generic/bitops/find.h>
    +
    #endif /* __ASM_SH_BITOPS_H */
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-04-01 02:33    [W:2.868 / U:0.840 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site