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

• Lines: 32
• Date: Mon Jun 19 17:59:37 2000
• Orig file: v2.4.0-test1/linux/arch/sh/kernel/time.c
• Orig date: Tue May 23 15:31:34 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/sh/kernel/time.c linux/arch/sh/kernel/time.c
@@ -8,6 +8,7 @@
  *    Copyright (C) 1991, 1992, 1995  Linus Torvalds
  */
 
+#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -421,7 +422,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
 		bus_clock = master_clock/pfc;
 	}
 #elif defined(__SH4__)
@@ -443,6 +448,11 @@
 	interval = (module_clock/(HZ*4));
 
 	printk("Interval = %ld\n", interval);
+
+	current_cpu_data.cpu_clock    = cpu_clock;
+	current_cpu_data.master_clock = master_clock;
+	current_cpu_data.bus_clock    = bus_clock;
+	current_cpu_data.module_clock = module_clock;
 
 	/* Start TMU0 */
 	ctrl_outb(TMU_TOCR_INIT, TMU_TOCR);