Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f03da6e2 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Fix BogoMIPS display on UP and some minor cosmetical things. 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 589391a0

arch/mips/kernel/cpu-probe.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/mips/kernel/smp.c

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ void __init smp_cpus_done(unsigned int max_cpus) 
/* 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();

include/asm-mips/bugs.h

+5 −0
Original line number Diff line number Diff line
@@ -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_64BIT

	check_bugs64();

include/asm-mips/delay.h

+0 −6
Original line number Diff line number Diff line
@@ -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 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj) 
	__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)