Messages in this thread Patch in this message | | | Date | Sun, 4 Jul 2004 03:12:18 -0700 | From | Andrew Morton <> | Subject | Re: [PATCH] fix power3 boot |
| |
Anton Blanchard <anton@samba.org> wrote: > > @@ -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; >
That line was already deleted by paulus's "EEH fixes for POWER5 machines (1/2)" patch, so we end up with the below.
diff -puN arch/ppc64/kernel/eeh.c~ppc64-fix-power3-boot arch/ppc64/kernel/eeh.c --- 25/arch/ppc64/kernel/eeh.c~ppc64-fix-power3-boot 2004-07-04 03:08:52.772504640 -0700 +++ 25-akpm/arch/ppc64/kernel/eeh.c 2004-07-04 03:08:52.778503728 -0700 @@ -587,6 +587,8 @@ void __init eeh_init(void) return; } + 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"); _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |