Commit 5f8539e2 authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

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: 0bc8fb4d ("um: Implement ndelay/udelay in time-travel mode")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 1c3e979b

arch/um/include/asm/delay.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */