diff options
author | Greg Ungerer <gerg@snapgear.com> | 2008-02-01 02:38:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:00:01 -0500 |
commit | c9f27c3619b3ee26b8ec47692bdd3a7ac075ad87 (patch) | |
tree | 2ad64678425cead0ec63774d542d7e66089b1cea | |
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>
-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 @@ | |||
22 | #include <linux/timex.h> | 22 | #include <linux/timex.h> |
23 | 23 | ||
24 | #include <asm/machdep.h> | 24 | #include <asm/machdep.h> |
25 | #include <asm/io.h> | ||
26 | #include <asm/irq_regs.h> | 25 | #include <asm/irq_regs.h> |
27 | 26 | ||
28 | #define TICK_SIZE (tick_nsec / 1000) | 27 | #define TICK_SIZE (tick_nsec / 1000) |
@@ -66,29 +65,6 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy) | |||
66 | else | 65 | else |
67 | last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */ | 66 | last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */ |
68 | } | 67 | } |
69 | #ifdef CONFIG_HEARTBEAT | ||
70 | /* use power LED as a heartbeat instead -- much more useful | ||
71 | for debugging -- based on the version for PReP by Cort */ | ||
72 | /* acts like an actual heart beat -- ie thump-thump-pause... */ | ||
73 | if (mach_heartbeat) { | ||
74 | static unsigned cnt = 0, period = 0, dist = 0; | ||
75 | |||
76 | if (cnt == 0 || cnt == dist) | ||
77 | mach_heartbeat( 1 ); | ||
78 | else if (cnt == 7 || cnt == dist+7) | ||
79 | mach_heartbeat( 0 ); | ||
80 | |||
81 | if (++cnt > period) { | ||
82 | cnt = 0; | ||
83 | /* The hyperbolic function below modifies the heartbeat period | ||
84 | * length in dependency of the current (5min) load. It goes | ||
85 | * through the points f(0)=126, f(1)=86, f(5)=51, | ||
86 | * f(inf)->30. */ | ||
87 | period = ((672<<FSHIFT)/(5*avenrun[0]+(7<<FSHIFT))) + 30; | ||
88 | dist = period / 4; | ||
89 | } | ||
90 | } | ||
91 | #endif /* CONFIG_HEARTBEAT */ | ||
92 | 68 | ||
93 | write_sequnlock(&xtime_lock); | 69 | write_sequnlock(&xtime_lock); |
94 | return(IRQ_HANDLED); | 70 | return(IRQ_HANDLED); |