diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 17:07:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 17:07:38 -0800 |
| commit | 1811534a80697b34add31cff53a321cfc291ddfe (patch) | |
| tree | ed4978f2fcf8565baf61afbe4b3d10187cf577a8 /arch/mips/kernel/csrc-r4k.c | |
| parent | b62c855938be50c13f3f2aa81fafe4a9ca2b6650 (diff) | |
| parent | e6a1bb725eab1348d4a985b7faeff8186210d7b4 (diff) | |
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.
Diffstat (limited to 'arch/mips/kernel/csrc-r4k.c')
| -rw-r--r-- | arch/mips/kernel/csrc-r4k.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 74c5c62365a..0e2b5cd81f6 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; |