CVSROOT: /home/cvs
Module name: linux
Changes by: ralf@ftp.linux-mips.org 05/04/13 14:37:32
Modified files:
arch/mips/kernel: cpu-probe.c smp.c
include/asm-mips: bugs.h delay.h
Log message:
Fix BogoMIPS display on UP and some minor cosmetical things.
diff -urN linux/arch/mips/kernel/cpu-probe.c linux/arch/mips/kernel/cpu-probe.c
--- linux/arch/mips/kernel/cpu-probe.c 2005/04/08 20:36:05 1.43
+++ linux/arch/mips/kernel/cpu-probe.c 2005/04/13 13:37:32 1.44
@@ -17,7 +17,6 @@
#include <linux/ptrace.h>
#include <linux/stddef.h>
-#include <asm/bugs.h>
#include <asm/cpu.h>
#include <asm/fpu.h>
#include <asm/mipsregs.h>
diff -urN linux/arch/mips/kernel/smp.c linux/arch/mips/kernel/smp.c
--- linux/arch/mips/kernel/smp.c 2005/03/18 17:36:53 1.77
+++ linux/arch/mips/kernel/smp.c 2005/04/13 13:37:32 1.78
@@ -226,7 +226,6 @@
/* called from main before smp_init() */
void __init smp_prepare_cpus(unsigned int max_cpus)
{
- cpu_data[0].udelay_val = loops_per_jiffy;
init_new_context(current, &init_mm);
current_thread_info()->cpu = 0;
smp_tune_scheduling();
diff -urN linux/include/asm-mips/bugs.h linux/include/asm-mips/bugs.h
--- linux/include/asm-mips/bugs.h 2003/07/25 22:49:24 1.10
+++ linux/include/asm-mips/bugs.h 2005/04/13 13:37:32 1.11
@@ -8,12 +8,17 @@
#define _ASM_BUGS_H
#include <linux/config.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_MIPS64
check_bugs64();
diff -urN linux/include/asm-mips/delay.h linux/include/asm-mips/delay.h
--- linux/include/asm-mips/delay.h 2004/10/08 02:41:17 1.16
+++ linux/include/asm-mips/delay.h 2005/04/13 13:37:32 1.17
@@ -15,8 +15,6 @@
#include <asm/compiler.h>
-extern unsigned long loops_per_jiffy;
-
static inline void __delay(unsigned long loops)
{
if (sizeof(long) == 4)
@@ -82,11 +80,7 @@
__delay(usecs);
}
-#ifdef CONFIG_SMP
#define __udelay_val cpu_data[smp_processor_id()].udelay_val
-#else
-#define __udelay_val loops_per_jiffy
-#endif
#define udelay(usecs) __udelay((usecs),__udelay_val)
|