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.16 0336/1039] um: fix ndelay/udelay defines
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 5f8539e2ff962e25b57742ca7106456403abbc94 ]

    Many places in the kernel use 'udelay' as an identifier, and
    are broken with the current "#define udelay um_udelay". Fix
    this by adding an argument to the macro, and do the same to
    'ndelay' as well, just in case.

    Fixes: 0bc8fb4dda2b ("um: Implement ndelay/udelay in time-travel mode")
    Reported-by: kernel test robot <lkp@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/um/include/asm/delay.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/um/include/asm/delay.h b/arch/um/include/asm/delay.h
    index 56fc2b8f2dd01..e79b2ab6f40c8 100644
    --- a/arch/um/include/asm/delay.h
    +++ b/arch/um/include/asm/delay.h
    @@ -14,7 +14,7 @@ static inline void um_ndelay(unsigned long nsecs)
    ndelay(nsecs);
    }
    #undef ndelay
    -#define ndelay um_ndelay
    +#define ndelay(n) um_ndelay(n)

    static inline void um_udelay(unsigned long usecs)
    {
    @@ -26,5 +26,5 @@ static inline void um_udelay(unsigned long usecs)
    udelay(usecs);
    }
    #undef udelay
    -#define udelay um_udelay
    +#define udelay(n) um_udelay(n)
    #endif /* __UM_DELAY_H */
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 01:14    [W:2.652 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site