mirror of
https://github.com/torvalds/linux.git
synced 2024-12-14 23:25:54 +00:00
5210edcd52
At some recent point arch/mips/include/asm/delay.h has started being included into csrc-octeon.c where the __?delay() functions are defined. This causes a compile failure due to conflicting declarations and definitions of the functions. It turns out that the generic definitions in arch/mips/lib/delay.c also conflict. Proposed fix: Declare the functions to take unsigned long parameters just like asm-generic (and x86) does. Update __delay to agree (__ndelay and __udelay need no change). Bonus: Get rid of 'inline' from __delay() definition, as it is globally visible, and the compiler should be making this decision itself (it does in fact inline the function without being told to). Signed-off-by: David Daney <david.daney@cavium.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/4354/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> |
||
|---|---|---|
| .. | ||
| ashldi3.c | ||
| ashrdi3.c | ||
| cmpdi2.c | ||
| csum_partial.S | ||
| delay.c | ||
| dump_tlb.c | ||
| iomap-pci.c | ||
| iomap.c | ||
| libgcc.h | ||
| lshrdi3.c | ||
| Makefile | ||
| memcpy.S | ||
| memset.S | ||
| r3k_dump_tlb.c | ||
| strlen_user.S | ||
| strncpy_user.S | ||
| strnlen_user.S | ||
| ucmpdi2.c | ||
| uncached.c | ||