diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2008-02-01 17:38:20 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 21:00:01 +1100 |
| commit | c9f27c3619b3ee26b8ec47692bdd3a7ac075ad87 (patch) | |
| tree | 2ad64678425cead0ec63774d542d7e66089b1cea /arch/m68knommu | |
| parent | 7c74806bc9addc312f59f2e7388b3a436c0c5131 (diff) | |
m68knommu: remove dead code from m68knommu timer code
Remove unused LED heartbeat code from m68knommu timer code.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68knommu')
| -rw-r--r-- | arch/m68knommu/kernel/time.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c index 77e5375a2dd5..207a55bdde98 100644 --- a/arch/m68knommu/kernel/time.c +++ b/arch/m68knommu/kernel/time.c @@ -22,7 +22,6 @@ #include <linux/timex.h> #include <asm/machdep.h> -#include <asm/io.h> #include <asm/irq_regs.h> #define TICK_SIZE (tick_nsec / 1000) @@ -66,29 +65,6 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy) else last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */ } -#ifdef CONFIG_HEARTBEAT - /* use power LED as a heartbeat instead -- much more useful - for debugging -- based on the version for PReP by Cort */ - /* acts like an actual heart beat -- ie thump-thump-pause... */ - if (mach_heartbeat) { - static unsigned cnt = 0, period = 0, dist = 0; - - if (cnt == 0 || cnt == dist) - mach_heartbeat( 1 ); - else if (cnt == 7 || cnt == dist+7) - mach_heartbeat( 0 ); - - if (++cnt > period) { - cnt = 0; - /* The hyperbolic function below modifies the heartbeat period - * length in dependency of the current (5min) load. It goes - * through the points f(0)=126, f(1)=86, f(5)=51, - * f(inf)->30. */ - period = ((672<<FSHIFT)/(5*avenrun[0]+(7<<FSHIFT))) + 30; - dist = period / 4; - } - } -#endif /* CONFIG_HEARTBEAT */ write_sequnlock(&xtime_lock); return(IRQ_HANDLED); |