lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix BogoMIPS display on UP and some minor cosmetical things.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
2005-04-13 13:37:32 +00:00
parent 589391a0fe
commit f03da6e28e
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/kernel/cpu-probe.c
View File

@@ -17,7 +17,6 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <asm/bugs.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>

1
arch/mips/kernel/smp.c
View File

@@ -226,7 +226,6 @@ void __init smp_cpus_done(unsigned int max_cpus)
/* called from main before smp_init() */ /* called from main before smp_init() */
void __init smp_prepare_cpus(unsigned int max_cpus) void __init smp_prepare_cpus(unsigned int max_cpus)
{ {
cpu_data[0].udelay_val = loops_per_jiffy;
init_new_context(current, &init_mm); init_new_context(current, &init_mm);
current_thread_info()->cpu = 0; current_thread_info()->cpu = 0;
smp_tune_scheduling(); smp_tune_scheduling();

5
include/asm-mips/bugs.h
View File

@@ -8,12 +8,17 @@
#define _ASM_BUGS_H #define _ASM_BUGS_H
#include <linux/config.h> #include <linux/config.h>
#include <asm/cpu.h>
#include <asm/cpu-info.h>
extern void check_bugs32(void); extern void check_bugs32(void);
extern void check_bugs64(void); extern void check_bugs64(void);
static inline void check_bugs(void) static inline void check_bugs(void)
{ {
unsigned int cpu = smp_processor_id();
cpu_data[cpu].udelay_val = loops_per_jiffy;
check_bugs32(); check_bugs32();
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
check_bugs64(); check_bugs64();

6
include/asm-mips/delay.h
View File

@@ -15,8 +15,6 @@
#include <asm/compiler.h> #include <asm/compiler.h>
extern unsigned long loops_per_jiffy;
static inline void __delay(unsigned long loops) static inline void __delay(unsigned long loops)
{ {
if (sizeof(long) == 4) if (sizeof(long) == 4)
@@ -82,11 +80,7 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj)
__delay(usecs); __delay(usecs);
} }
#ifdef CONFIG_SMP
#define __udelay_val cpu_data[smp_processor_id()].udelay_val #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) #define udelay(usecs) __udelay((usecs),__udelay_val)