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>
61 lines
1.5 KiB
C
61 lines
1.5 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1994 by Waldorf Electronics
|
|
* Copyright (C) 1995 - 2000, 01, 03 by Ralf Baechle
|
|
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
|
|
* Copyright (C) 2007 Maciej W. Rozycki
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/param.h>
|
|
#include <linux/smp.h>
|
|
|
|
#include <asm/compiler.h>
|
|
#include <asm/war.h>
|
|
|
|
void __delay(unsigned long loops)
|
|
{
|
|
__asm__ __volatile__ (
|
|
" .set noreorder \n"
|
|
" .align 3 \n"
|
|
"1: bnez %0, 1b \n"
|
|
#if __SIZEOF_LONG__ == 4
|
|
" subu %0, 1 \n"
|
|
#else
|
|
" dsubu %0, 1 \n"
|
|
#endif
|
|
" .set reorder \n"
|
|
: "=r" (loops)
|
|
: "0" (loops));
|
|
}
|
|
EXPORT_SYMBOL(__delay);
|
|
|
|
/*
|
|
* Division by multiplication: you don't have to worry about
|
|
* loss of precision.
|
|
*
|
|
* Use only for very small delays ( < 1 msec). Should probably use a
|
|
* lookup table, really, as the multiplications take much too long with
|
|
* short delays. This is a "reasonable" implementation, though (and the
|
|
* first constant multiplications gets optimized away if the delay is
|
|
* a constant)
|
|
*/
|
|
|
|
void __udelay(unsigned long us)
|
|
{
|
|
unsigned int lpj = raw_current_cpu_data.udelay_val;
|
|
|
|
__delay((us * 0x000010c7ull * HZ * lpj) >> 32);
|
|
}
|
|
EXPORT_SYMBOL(__udelay);
|
|
|
|
void __ndelay(unsigned long ns)
|
|
{
|
|
unsigned int lpj = raw_current_cpu_data.udelay_val;
|
|
|
|
__delay((ns * 0x00000005ull * HZ * lpj) >> 32);
|
|
}
|
|
EXPORT_SYMBOL(__ndelay);
|