patch-2.4.10 linux/arch/ppc/kernel/pmac_time.c
Next file: linux/arch/ppc/kernel/ppc_asm.h
Previous file: linux/arch/ppc/kernel/pmac_smp.c
Back to the patch index
Back to the overall index
- Lines: 32
- Date:
Sat Sep 8 12:38:42 2001
- Orig file:
v2.4.9/linux/arch/ppc/kernel/pmac_time.c
- Orig date:
Mon Aug 27 12:41:39 2001
diff -u --recursive --new-file v2.4.9/linux/arch/ppc/kernel/pmac_time.c linux/arch/ppc/kernel/pmac_time.c
@@ -1,5 +1,5 @@
/*
- * BK Id: SCCS/s.pmac_time.c 1.11 07/06/01 15:46:39 trini
+ * BK Id: SCCS/s.pmac_time.c 1.16 09/08/01 15:47:42 paulus
*/
/*
* Support for periodic interrupts (100 per second) and for getting
@@ -22,7 +22,7 @@
#include <linux/cuda.h>
#include <linux/pmu.h>
-#include <asm/init.h>
+#include <asm/sections.h>
#include <asm/prom.h>
#include <asm/system.h>
#include <asm/io.h>
@@ -260,8 +260,13 @@
pmu_register_sleep_notifier(&time_sleep_notifier);
#endif /* CONFIG_PMAC_PBOOK */
- if (via_calibrate_decr())
- return;
+ /* We assume MacRISC2 machines have correct device-tree
+ * calibration. That's better since the VIA itself seems
+ * to be slightly off. --BenH
+ */
+ if (!machine_is_compatible("MacRISC2"))
+ if (via_calibrate_decr())
+ return;
/*
* The cpu node should have a timebase-frequency property
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)