[PATCH] fix power3 boot

[Anton Blanchard]

Hi,

We were calling init_pci_config_tokens too late in eeh_init. POWER3
(which doesnt have EEH) would fall out of eeh_init before calling it.

Signed-off-by: Anton Blanchard <anton@xxxxxxxxx>

diff -puN arch/ppc64/kernel/eeh.c~fix_power3 arch/ppc64/kernel/eeh.c
--- foobar2/arch/ppc64/kernel/eeh.c~fix_power3	2004-07-04 19:40:57.528231647 +1000
+++ foobar2-anton/arch/ppc64/kernel/eeh.c	2004-07-04 19:42:26.439823930 +1000
@@ -574,6 +574,8 @@ void __init eeh_init(void)
 	struct eeh_early_enable_info info;
 	char *eeh_force_off = strstr(saved_command_line, "eeh-force-off");
 
+	init_pci_config_tokens();
+
 	ibm_set_eeh_option = rtas_token("ibm,set-eeh-option");
 	ibm_set_slot_reset = rtas_token("ibm,set-slot-reset");
 	ibm_read_slot_reset_state = rtas_token("ibm,read-slot-reset-state");
@@ -588,7 +590,6 @@ void __init eeh_init(void)
 	}
 
 	/* Enable EEH for all adapters.  Note that eeh requires buid's */
-	init_pci_config_tokens();
 	for (phb = of_find_node_by_name(NULL, "pci"); phb;
 	     phb = of_find_node_by_name(phb, "pci")) {
 		unsigned long buid;

_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/