patch-2.4.3 linux/arch/ppc/kernel/prom.c

Next file: linux/arch/ppc/kernel/setup.c
Previous file: linux/arch/ppc/kernel/prep_setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.2/linux/arch/ppc/kernel/prom.c linux/arch/ppc/kernel/prom.c
@@ -757,8 +757,11 @@
 		setup_disp_fake_bi(RELOC(prom_disp_node));
 #endif
 
-	/* If OpenFirmware version >= 3, then use quiesce call */
-	if (prom_version >= 3) {
+	/* If pmac, then use quiesce call. We can't rely on prom_version
+	 * since some old iMacs appear to have an incorrect /openprom/model
+	 * entry in the device tree
+	 */
+	if (!chrp) {
 		prom_print(RELOC("Calling quiesce ...\n"));
 		call_prom(RELOC("quiesce"), 0, 0);
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)