diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-12-16 22:19:30 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-12-22 04:44:44 -0500 |
commit | 7b80fb32b39a51ce3e1afa051f5a616eb8ecbed3 (patch) | |
tree | 4ab8968c41898392e99569dbcb79febccac14d41 /arch/sh | |
parent | b94ea27570e4ae87942e2f2ae386d4007ef7ac58 (diff) |
sh: Kill off mv_heartbeat() from the machvec.
Nothing is using this any more, so get rid of it before anyone gets the
bright idea to start using it again.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/machvec.h | 2 | ||||
-rw-r--r-- | arch/sh/kernel/time_32.c | 5 | ||||
-rw-r--r-- | arch/sh/kernel/time_64.c | 5 |
3 files changed, 0 insertions, 12 deletions
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h index f1bae02ef7b6..e14e09b3d6d7 100644 --- a/arch/sh/include/asm/machvec.h +++ b/arch/sh/include/asm/machvec.h | |||
@@ -47,8 +47,6 @@ struct sh_machine_vector { | |||
47 | void (*mv_init_irq)(void); | 47 | void (*mv_init_irq)(void); |
48 | void (*mv_init_pci)(void); | 48 | void (*mv_init_pci)(void); |
49 | 49 | ||
50 | void (*mv_heartbeat)(void); | ||
51 | |||
52 | void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); | 50 | void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); |
53 | void (*mv_ioport_unmap)(void __iomem *); | 51 | void (*mv_ioport_unmap)(void __iomem *); |
54 | }; | 52 | }; |
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c index 1336f275326c..8457f83242c5 100644 --- a/arch/sh/kernel/time_32.c +++ b/arch/sh/kernel/time_32.c | |||
@@ -125,11 +125,6 @@ void handle_timer_tick(void) | |||
125 | if (current->pid) | 125 | if (current->pid) |
126 | profile_tick(CPU_PROFILING); | 126 | profile_tick(CPU_PROFILING); |
127 | 127 | ||
128 | #ifdef CONFIG_HEARTBEAT | ||
129 | if (sh_mv.mv_heartbeat != NULL) | ||
130 | sh_mv.mv_heartbeat(); | ||
131 | #endif | ||
132 | |||
133 | /* | 128 | /* |
134 | * Here we are in the timer irq handler. We just have irqs locally | 129 | * Here we are in the timer irq handler. We just have irqs locally |
135 | * disabled but we don't know if the timer_bh is running on the other | 130 | * disabled but we don't know if the timer_bh is running on the other |
diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c index bbb2af1004d9..59d2a03e8b3c 100644 --- a/arch/sh/kernel/time_64.c +++ b/arch/sh/kernel/time_64.c | |||
@@ -240,11 +240,6 @@ static inline void do_timer_interrupt(void) | |||
240 | 240 | ||
241 | do_timer(1); | 241 | do_timer(1); |
242 | 242 | ||
243 | #ifdef CONFIG_HEARTBEAT | ||
244 | if (sh_mv.mv_heartbeat != NULL) | ||
245 | sh_mv.mv_heartbeat(); | ||
246 | #endif | ||
247 | |||
248 | /* | 243 | /* |
249 | * If we have an externally synchronized Linux clock, then update | 244 | * If we have an externally synchronized Linux clock, then update |
250 | * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be | 245 | * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be |