---

yaml
---
r: 120138
b: refs/heads/master
c: 7b80fb3
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b94ea27570e4ae87942e2f2ae386d4007ef7ac58
+refs/heads/master: 7b80fb32b39a51ce3e1afa051f5a616eb8ecbed3

trunk/arch/sh/include/asm/machvec.h

@@ -47,8 +47,6 @@ struct sh_machine_vector {
 	void (*mv_init_irq)(void);
 	void (*mv_init_pci)(void);
 
-	void (*mv_heartbeat)(void);
-
 	void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
 	void (*mv_ioport_unmap)(void __iomem *);
 };

trunk/arch/sh/kernel/time_32.c

@@ -125,11 +125,6 @@ void handle_timer_tick(void)
 	if (current->pid)
 		profile_tick(CPU_PROFILING);
 
-#ifdef CONFIG_HEARTBEAT
-	if (sh_mv.mv_heartbeat != NULL)
-		sh_mv.mv_heartbeat();
-#endif
-
 	/*
 	 * Here we are in the timer irq handler. We just have irqs locally
 	 * disabled but we don't know if the timer_bh is running on the other

trunk/arch/sh/kernel/time_64.c

@@ -240,11 +240,6 @@ static inline void do_timer_interrupt(void)
 
 	do_timer(1);
 
-#ifdef CONFIG_HEARTBEAT
-	if (sh_mv.mv_heartbeat != NULL)
-		sh_mv.mv_heartbeat();
-#endif
-
 	/*
 	 * If we have an externally synchronized Linux clock, then update
 	 * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be