aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-30 17:07:38 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-30 17:07:38 -0800
commit1811534a80697b34add31cff53a321cfc291ddfe (patch)
treeed4978f2fcf8565baf61afbe4b3d10187cf577a8
parentb62c855938be50c13f3f2aa81fafe4a9ca2b6650 (diff)
parente6a1bb725eab1348d4a985b7faeff8186210d7b4 (diff)
downloadlinux-stericsson-1811534a80697b34add31cff53a321cfc291ddfe.tar.gz
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.
-rw-r--r--arch/mips/kernel/csrc-r4k.c6
-rw-r--r--include/asm-mips/cpu-features.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
index 74c5c62365a8..0e2b5cd81f67 100644
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
@@ -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;
diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h
index f6bd308f047f..5ea701fc3425 100644
--- a/include/asm-mips/cpu-features.h
+++ b/include/asm-mips/cpu-features.h
@@ -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 */