xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

um: fix ndelay/udelay defines

Browse Source 
[ 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: 0bc8fb4dda ("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>
This commit is contained in:
Johannes Berg
2021-08-31 09:27:53 +02:00
committed by Greg Kroah-Hartman
parent b2b1b490bd
commit 8411722e56
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/include/asm/delay.h
View File

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