patch-2.4.0-test6 linux/arch/sh/kernel/time.c

• Lines: 37
• Date: Wed Aug 9 13:59:04 2000
• Orig file: v2.4.0-test5/linux/arch/sh/kernel/time.c
• Orig date: Thu Jul 27 17:37:59 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/sh/kernel/time.c linux/arch/sh/kernel/time.c
@@ -26,6 +26,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/delay.h>
+#include <asm/machvec.h>
 
 #include <linux/timex.h>
 #include <linux/irq.h>
@@ -226,6 +227,11 @@
 		sh_do_profile(regs->pc);
 #endif
 
+#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
@@ -441,11 +447,11 @@
 		tmp  = (frqcr & 0x2000) >> 11;
 		tmp |= frqcr & 0x0003;
 		pfc = pfc_table[tmp];
-#ifdef CONFIG_SH_HP600
-		master_clock = cpu_clock/6;
-#else
-		master_clock = cpu_clock;
-#endif
+		if (MACH_HP600) {
+			master_clock = cpu_clock/6;
+		} else {
+			master_clock = cpu_clock;
+		}
 		bus_clock = master_clock/pfc;
 	}
 #elif defined(__SH4__)