Re: 2.6.14-mm1

From: Serge Hallyn
Date: Fri Nov 11 2005 - 12:59:19 EST


Quoting Linda Xie (lxie@xxxxxxxxxx):
> Hi Andrew,
>
> It seems that the latest mm1 doesn't have the following patch that John
> Rose sent on last Friday.

One more thing seems to be missing. -mm2 compiles and boots if
i add:

Signed-off-by: Serge Hallyn <serue@xxxxxxxxxx>
---

Index: linux-2.6.14-mm2/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.14-mm2.orig/drivers/pci/hotplug/rpaphp_pci.c 2005-11-11 11:42:21.000000000 -0600
+++ linux-2.6.14-mm2/drivers/pci/hotplug/rpaphp_pci.c 2005-11-11 11:48:40.000000000 -0600
@@ -253,7 +253,7 @@ rpaphp_pci_config_slot(struct pci_bus *b
if (!dn || !dn->child)
return NULL;

- if (systemcfg->platform == PLATFORM_PSERIES_LPAR) {
+ if (_machine == PLATFORM_PSERIES_LPAR) {
of_scan_bus(dn, bus);
if (list_empty(&bus->devices)) {
err("%s: No new device found\n", __FUNCTION__);
-
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/