]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
m68knommu: remove dead code from m68knommu timer code
authorGreg Ungerer <gerg@snapgear.com>
Fri, 1 Feb 2008 07:38:20 +0000 (17:38 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 10:00:01 +0000 (21:00 +1100)
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>
arch/m68knommu/kernel/time.c

index 77e5375a2dd505ecc90e0dee224ed953e043ab56..207a55bdde98184db3ed5c2cedec59c3e10e0820 100644 (file)
@@ -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);