diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2021-08-31 09:27:53 +0200 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2021-12-21 21:13:43 +0100 |
| commit | 5f8539e2ff962e25b57742ca7106456403abbc94 (patch) | |
| tree | 5deb5706a4bb83422f827ed168ebca1677b9d080 /arch/um/include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid (diff) | |
| download | linux-dev-5f8539e2ff962e25b57742ca7106456403abbc94.tar.xz linux-dev-5f8539e2ff962e25b57742ca7106456403abbc94.zip | |
um: fix ndelay/udelay defines
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>
Diffstat (limited to 'arch/um/include')
| -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 */ |