Merge ../linux-2.6 by hand

1 files changed, 6 insertions, 0 deletions

diff --git a/include/asm-mips/bugs.h b/include/asm-mips/bugs.h
index b14b961c2100..cb2ea7c15c7a 100644
--- a/include/asm-mips/bugs.h
+++ b/include/asm-mips/bugs.h
@@ -8,12 +8,18 @@
 #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();