diff options
author | 2008-04-28 11:43:04 +0200 | |
---|---|---|
committer | 2008-07-23 15:11:28 +1000 | |
commit | 2b9a69861c39ae4c232385def833816acc07a0a4 (patch) | |
tree | d4edc8214ea3bb32e61128de78588cb8058cd863 /arch/m68knommu/kernel | |
parent | m68knommu: add read_barrier_depends() and irqs_disabled_flags() (diff) | |
download | linux-2b9a69861c39ae4c232385def833816acc07a0a4.tar.gz linux-2b9a69861c39ae4c232385def833816acc07a0a4.tar.bz2 linux-2b9a69861c39ae4c232385def833816acc07a0a4.zip |
m68knommu: MCF5307 PIT GENERIC_CLOCKEVENTS support
The PIT code has been changed in order to suppport GENERIC_CLOCKEVENTS.
The priority of the PIT clocksource has been decreased in favor of the
DMA timer.
pit_cycles_per_jiffy become a constant (PIT_CYCLES_PER_JIFFY) because it
is known at compile time and does not change afterwards.
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu/kernel')
-rw-r--r-- | arch/m68knommu/kernel/time.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c index 67944aa27280..d182b2f72211 100644 --- a/arch/m68knommu/kernel/time.c +++ b/arch/m68knommu/kernel/time.c @@ -33,6 +33,7 @@ static inline int set_rtc_mmss(unsigned long nowtime) return -1; } +#ifndef CONFIG_GENERIC_CLOCKEVENTS /* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick @@ -54,6 +55,7 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy) #endif return(IRQ_HANDLED); } +#endif static unsigned long read_rtc_mmss(void) { |