aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips/delay.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-04-13 09:37:32 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:31:05 -0400
commitf03da6e28ea2d20f1a8451869fd1c9ea9935022b (patch)
tree09a2e8041c2d4e1dcf9d35990caef9677db12218 /include/asm-mips/delay.h
parent589391a0fe229573439994b3be2cc9377722cf3d (diff)
Fix BogoMIPS display on UP and some minor cosmetical things.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/delay.h')
-rw-r--r--include/asm-mips/delay.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-mips/delay.h b/include/asm-mips/delay.h
index a606dbee041..e906382576e 100644
--- a/include/asm-mips/delay.h
+++ b/include/asm-mips/delay.h
@@ -15,8 +15,6 @@
15 15
16#include <asm/compiler.h> 16#include <asm/compiler.h>
17 17
18extern unsigned long loops_per_jiffy;
19
20static inline void __delay(unsigned long loops) 18static inline void __delay(unsigned long loops)
21{ 19{
22 if (sizeof(long) == 4) 20 if (sizeof(long) == 4)
@@ -82,11 +80,7 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj)
82 __delay(usecs); 80 __delay(usecs);
83} 81}
84 82
85#ifdef CONFIG_SMP
86#define __udelay_val cpu_data[smp_processor_id()].udelay_val 83#define __udelay_val cpu_data[smp_processor_id()].udelay_val
87#else
88#define __udelay_val loops_per_jiffy
89#endif
90 84
91#define udelay(usecs) __udelay((usecs),__udelay_val) 85#define udelay(usecs) __udelay((usecs),__udelay_val)
92 86