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

Commit 1811534a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix build.
  [MIPS] Fix use of smp_processor_id() in preemptible code.
parents b62c8559 e6a1bb72

arch/mips/kernel/csrc-r4k.c

+5 −1
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
 *

 * Copyright (C) 2007 by Ralf Baechle

 */

#include <linux/clocksource.h>

#include <linux/init.h>



#include <asm/time.h>



static cycle_t c0_hpt_read(void)

{
@@ -18,7 +22,7 @@ static struct clocksource clocksource_mips = { 
	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



static void __init init_mips_clocksource(void)

void __init init_mips_clocksource(void)

{

	/* Calclate a somewhat reasonable rating value */

	clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000;

include/asm-mips/cpu-features.h

+3 −3
Original line number Diff line number Diff line
@@ -207,13 +207,13 @@ 
#endif



#ifndef cpu_dcache_line_size

#define cpu_dcache_line_size()	current_cpu_data.dcache.linesz

#define cpu_dcache_line_size()	cpu_data[0].dcache.linesz

#endif

#ifndef cpu_icache_line_size

#define cpu_icache_line_size()	current_cpu_data.icache.linesz

#define cpu_icache_line_size()	cpu_data[0].icache.linesz

#endif

#ifndef cpu_scache_line_size

#define cpu_scache_line_size()	current_cpu_data.scache.linesz

#define cpu_scache_line_size()	cpu_data[0].scache.linesz

#endif



#endif /* __ASM_CPU_FEATURES_H */