Re: 2.6.14-mm2

[Andrew Morton <akpm@osdl.org>]

Badari Pulavarty <pbadari@gmail.com> wrote:
>
> On Thu, 2005-11-10 at 20:35 -0800, Andrew Morton wrote:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14/2.6.14-mm2/
> > 
> 
> Doesn't compile on my PPC box. Looking at the problem to fix it.
> 
> Thanks,
> Badari
> 
> elm3b157:/usr/src/linux-2.6.14 # make -j8 zImage
>   CHK     include/linux/version.h
>   CHK     include/linux/compile.h
>   CHK     usr/initramfs_list
>   CC      drivers/pci/syscall.o
>   CC      drivers/pci/hotplug/rpaphp_pci.o
>   CC      drivers/pci/hotplug/rpaphp_slot.o
> drivers/pci/hotplug/rpaphp_pci.c: In function `rpaphp_pci_config_slot':
> drivers/pci/hotplug/rpaphp_pci.c:256: error: `systemcfg' undeclared
> (first use in this function)
> drivers/pci/hotplug/rpaphp_pci.c:256: error: (Each undeclared identifier
> is reported only once
> drivers/pci/hotplug/rpaphp_pci.c:256: error: for each function it
> appears in.)
> make[3]: *** [drivers/pci/hotplug/rpaphp_pci.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
> make[2]: *** [drivers/pci/hotplug] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [drivers/pci] Error 2
> make: *** [drivers] Error 2

This?

Signed-off-by: Serge Hallyn <serue@us.ibm.com>
---

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__);