Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...

[linux.git] / include / asm-mips / bugs.h

diff --git a/include/asm-mips/bugs.h b/include/asm-mips/bugs.h
index b14b961c2100c4394305023f0621c50caf3fef31..0d7f9c1f55469e4c7d9700ba44bb3ad75b787ba6 100644 (file)
--- a/include/asm-mips/bugs.h
+++ b/include/asm-mips/bugs.h
@@ -7,13 +7,18 @@
 #ifndef _ASM_BUGS_H
 #define _ASM_BUGS_H
 
-#include <linux/config.h>
+#include <linux/delay.h>
+#include <asm/cpu.h>
+#include <asm/cpu-info.h>
 
 extern void check_bugs32(void);
 extern void check_bugs64(void);
 
 static inline void check_bugs(void)
 {
+       unsigned int cpu = smp_processor_id();
+
+       cpu_data[cpu].udelay_val = loops_per_jiffy;
        check_bugs32();
 #ifdef CONFIG_64BIT
        check_bugs64();