[PATCH] rpaphp broken in ameslab

[Linda Xie]

Hi Joel,

 Any changes to rpaphp(or rpaphp related) now should be posted on PCI
hotplug mailing list (CC to kernel mailing list and Greg KH).  After
Greg applies the
changes to his tree, the changes will be merged into amslab. BTW, I
posted a separate patch that exports pci_scan_chid_bus for rpaphp a
while ago.

Greg,  Can you apply the attached patch to your tree?

Signed-off-by: Linda Xie lxie at us.ibm.com

Thanks,

Linda




Joel Schopp wrote:

> A couple of things got broken in ameslab.  Not sure why or where, but
> here is a patch that fixed it for me.  Please apply to Ameslab barring
> any objections.
>
> -Joel
>
>------------------------------------------------------------------------
>
>diff -Nru a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
>--- a/drivers/pci/hotplug/rpaphp_core.c	Tue Jun 29 13:42:55 2004
>+++ b/drivers/pci/hotplug/rpaphp_core.c	Tue Jun 29 13:42:55 2004
>@@ -455,11 +455,6 @@
> 	return disable_slot(rpaphp_find_hotplug_slot(dev));
> }
>
>-static int rpaphp_disable_slot(struct pci_dev *dev)
>-{
>-	return disable_slot(rpaphp_find_hotplug_slot(dev));
>-}
>-
> static int disable_slot(struct hotplug_slot *hotplug_slot)
> {
> 	int retval;
>diff -Nru a/drivers/pci/probe.c b/drivers/pci/probe.c
>--- a/drivers/pci/probe.c	Tue Jun 29 13:42:55 2004
>+++ b/drivers/pci/probe.c	Tue Jun 29 13:42:55 2004
>@@ -326,7 +326,7 @@
> 	return child;
> }
>
>-static unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
>+unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
>
> /*
>  * If it's a bridge, configure it and scan the bus behind it.
>@@ -694,7 +694,7 @@
> 	return nr;
> }
>
>-static unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
>+unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
> {
> 	unsigned int devfn, pass, max = bus->secondary;
> 	struct pci_dev *dev;
>
>

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: probe.patch
Url: http://ozlabs.org/pipermail/linuxppc64-dev/attachments/20040629/e969eab5/attachment.txt