Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Johannes Berg and committed by
Richard Weinberger
5f8539e2 1c3e979b

+2 -2
+2 -2
arch/um/include/asm/delay.h
··· 14 14 ndelay(nsecs); 15 15 } 16 16 #undef ndelay 17 - #define ndelay um_ndelay 17 + #define ndelay(n) um_ndelay(n) 18 18 19 19 static inline void um_udelay(unsigned long usecs) 20 20 { ··· 26 26 udelay(usecs); 27 27 } 28 28 #undef udelay 29 - #define udelay um_udelay 29 + #define udelay(n) um_udelay(n) 30 30 #endif /* __UM_DELAY_H */