summaryrefslogtreecommitdiff
path: root/arch/mips/mm
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2012-09-28 18:34:10 (GMT)
committerRalf Baechle <ralf@linux-mips.org>2012-10-16 20:20:03 (GMT)
commit5210edcd527773c227465ad18e416a894966324f (patch)
tree0143649156db1090faf516c83297a5b4faa8ceda /arch/mips/mm
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
downloadlinux-5210edcd527773c227465ad18e416a894966324f.tar.xz
MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h
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>
Diffstat (limited to 'arch/mips/mm')
0 files changed, 0 insertions, 0 deletions