lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 800/846] bitops: protect find_first_{,zero}_bit properly
    Date
    From: Yury Norov <yury.norov@gmail.com>

    commit b7ec62d7ee0f0b8af6ba190501dff7f9ee6545ca upstream.

    find_first_bit() and find_first_zero_bit() are not protected with
    ifdefs as other functions in find.h. It causes build errors on some
    platforms if CONFIG_GENERIC_FIND_FIRST_BIT is enabled.

    Signed-off-by: Yury Norov <yury.norov@gmail.com>
    Fixes: 2cc7b6a44ac2 ("lib: add fast path for find_first_*_bit() and find_last_bit()")
    Reported-by: kernel test robot <lkp@intel.com>
    Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/asm-generic/bitops/find.h | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h
    index 0d132ee2a291..835f959a25f2 100644
    --- a/include/asm-generic/bitops/find.h
    +++ b/include/asm-generic/bitops/find.h
    @@ -97,6 +97,7 @@ unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,

    #ifdef CONFIG_GENERIC_FIND_FIRST_BIT

    +#ifndef find_first_bit
    /**
    * find_first_bit - find the first set bit in a memory region
    * @addr: The address to start the search at
    @@ -116,7 +117,9 @@ unsigned long find_first_bit(const unsigned long *addr, unsigned long size)

    return _find_first_bit(addr, size);
    }
    +#endif

    +#ifndef find_first_zero_bit
    /**
    * find_first_zero_bit - find the first cleared bit in a memory region
    * @addr: The address to start the search at
    @@ -136,6 +139,8 @@ unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size)

    return _find_first_zero_bit(addr, size);
    }
    +#endif
    +
    #else /* CONFIG_GENERIC_FIND_FIRST_BIT */

    #ifndef find_first_bit
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:41    [W:2.678 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site