diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2021-08-31 10:27:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-27 13:03:44 +0300 |
| commit | 2a2f4f3aeafd684d1f8d790ef1ccb663ec8eb844 (patch) | |
| tree | cdab19d9dac3639fd1ce7dda5b31acebfb4881f5 /arch/um | |
| parent | 3a45c47034918d5496e37eb3e2ffae9a1f30b7af (diff) | |
| download | linux-2a2f4f3aeafd684d1f8d790ef1ccb663ec8eb844.tar.xz | |
um: fix ndelay/udelay defines
[ 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>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/delay.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/asm/delay.h b/arch/um/include/asm/delay.h index 56fc2b8f2dd0..e79b2ab6f40c 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 */ |