mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
um: fix ndelay/udelay defines
[ Upstream commit5f8539e2ff
] 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:
parent
6bb77e89ea
commit
702cafcbb6
1 changed files with 2 additions and 2 deletions
|
@ -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 */
|
||||
|
|
Loading…
Add table
Reference in a new issue