[PATCH][BUILD FAILURE 03/12] Re: Next April 21 : PPC64 randconfig [arch/powerpc/kernel/of_platform.o]

[Subrata Modak <subrata@linux.vnet.ibm.com>]

On Wed, 2009-04-22 at 00:20 +0530, Subrata Modak wrote:
> Reported this earlier on 14th April 2009:
> http://lkml.org/lkml/2009/4/14/480,
> 
> Michael,
> 
> Any fix in sight ?
> http://lkml.org/lkml/2009/4/14/676,
> 
> CC      arch/powerpc/kernel/of_platform.o
> arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':
> arch/powerpc/kernel/of_platform.c:270: error: implicit declaration of
> function 'pci_devs_phb_init_dynamic'
> arch/powerpc/kernel/of_platform.c:279: error: implicit declaration of
> function 'scan_phb'
> arch/powerpc/kernel/of_platform.c:295: error: implicit declaration of
> function 'pci_bus_add_devices'
> make[1]: *** [arch/powerpc/kernel/of_platform.o] Error 1
> make: *** [arch/powerpc/kernel] Error 2
> ---

Well, 'pci_devs_phb_init_dynamic', 'scan_phb' & 'pci_bus_add_devices'
has been defined at ./arch/powerpc/include/asm/ppc-pci.h, but as
	#ifdef CONFIG_PCI
the reason for which the declarations were not visible. And these
would churn out few additional failures also for PPC build, like:

CC      arch/powerpc/kernel/pci_dn.o
arch/powerpc/kernel/pci_dn.c:82: error: expected declaration specifiers or ‘...’ before ‘traverse_func’
arch/powerpc/kernel/pci_dn.c: In function ‘traverse_pci_devices’:
arch/powerpc/kernel/pci_dn.c:97: error: ‘pre’ undeclared (first use in this function)
arch/powerpc/kernel/pci_dn.c:97: error: (Each undeclared identifier is reported only once
arch/powerpc/kernel/pci_dn.c:97: error: for each function it appears in.)
arch/powerpc/kernel/pci_dn.c:97: error: implicit declaration of function ‘pre’
arch/powerpc/kernel/pci_dn.c:97: warning: assignment makes pointer from integer without a cast
arch/powerpc/kernel/pci_dn.c: In function ‘pci_devs_phb_init_dynamic’:
arch/powerpc/kernel/pci_dn.c:143: error: too many arguments to function ‘traverse_pci_devices’
arch/powerpc/kernel/pci_dn.c: In function ‘fetch_dev_dn’:
arch/powerpc/kernel/pci_dn.c:180: error: too many arguments to function ‘traverse_pci_devices’
arch/powerpc/kernel/pci_dn.c: In function ‘pci_devs_phb_init’:
arch/powerpc/kernel/pci_dn.c:224: error: ‘hose_list’ undeclared (first use in this function)
make[1]: *** [arch/powerpc/kernel/pci_dn.o] Error 1
make: *** [arch/powerpc/kernel/pci_dn.o] Error 2
---
CC      arch/powerpc/platforms/pseries/pci_dlpar.o
arch/powerpc/platforms/pseries/pci_dlpar.c: In function ‘pcibios_remove_pci_devices’:
arch/powerpc/platforms/pseries/pci_dlpar.c:88: error: implicit declaration of function ‘pci_remove_bus_device’
arch/powerpc/platforms/pseries/pci_dlpar.c: In function ‘pcibios_add_pci_devices’:
arch/powerpc/platforms/pseries/pci_dlpar.c:121: error: implicit declaration of function ‘pci_scan_slot’
arch/powerpc/platforms/pseries/pci_dlpar.c:130: error: implicit declaration of function ‘pci_scan_bridge’
arch/powerpc/platforms/pseries/pci_dlpar.c: In function ‘init_phb_dynamic’:
arch/powerpc/platforms/pseries/pci_dlpar.c:146: error: implicit declaration of function ‘rtas_setup_phb’
arch/powerpc/platforms/pseries/pci_dlpar.c:149: error: implicit declaration of function ‘pci_devs_phb_init_dynamic’
arch/powerpc/platforms/pseries/pci_dlpar.c:154: error: implicit declaration of function ‘scan_phb’
arch/powerpc/platforms/pseries/pci_dlpar.c: In function ‘remove_phb_dynamic’:
arch/powerpc/platforms/pseries/pci_dlpar.c:191: error: implicit declaration of function ‘pci_remove_bus’
make[1]: *** [arch/powerpc/platforms/pseries/pci_dlpar.o] Error 1
make: *** [arch/powerpc/platforms/pseries/pci_dlpar.o] Error 2
---

The following patch attempts to fix them all. I had tested them. Please review.

Signed-Off-By: Subrata Modak <subrata@linux.vnet.ibm.com>,
To: Paul Mackerras <paulus@samba.org>
To: Linuxppc-dev <Linuxppc-dev@ozlabs.org>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Sachin P Sant <sachinp@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next <linux-next@vger.kernel.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
---

--- linux-2.6.30-rc2-next20090421-randconfig/arch/powerpc/kernel/of_platform.c.orig	2009-04-22 09:50:32.000000000 -0500
+++ linux-2.6.30-rc2-next20090421-randconfig/arch/powerpc/kernel/of_platform.c	2009-04-22 10:06:52.000000000 -0500
@@ -230,7 +230,7 @@ struct of_device *of_find_device_by_phan
 EXPORT_SYMBOL(of_find_device_by_phandle);
 
 
-#ifdef CONFIG_PPC_OF_PLATFORM_PCI
+#if defined(CONFIG_PPC_OF_PLATFORM_PCI) && defined(CONFIG_PCI)
 
 /* The probing of PCI controllers from of_platform is currently
  * 64 bits only, mostly due to gratuitous differences between
--- linux-2.6.30-rc2-next20090421-randconfig/arch/powerpc/kernel/pci_dn.c.orig	2009-04-22 10:07:21.000000000 -0500
+++ linux-2.6.30-rc2-next20090421-randconfig/arch/powerpc/kernel/pci_dn.c	2009-04-22 10:09:10.000000000 -0500
@@ -35,6 +35,8 @@
  * Traverse_func that inits the PCI fields of the device node.
  * NOTE: this *must* be done before read/write config to the device.
  */
+
+#ifdef CONFIG_PCI
 static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
 {
 	struct pci_controller *phb = data;
@@ -226,3 +228,4 @@ void __init pci_devs_phb_init(void)
 
 	pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
 }
+#endif
--- linux-2.6.30-rc2-next20090421-randconfig/arch/powerpc/platforms/pseries/pci_dlpar.c.orig	2009-04-22 10:10:26.000000000 -0500
+++ linux-2.6.30-rc2-next20090421-randconfig/arch/powerpc/platforms/pseries/pci_dlpar.c	2009-04-22 10:12:23.000000000 -0500
@@ -33,6 +33,7 @@
 #include <asm/firmware.h>
 #include <asm/eeh.h>
 
+#ifdef CONFIG_PCI
 static struct pci_bus *
 find_bus_among_children(struct pci_bus *bus,
                         struct device_node *dn)
@@ -208,3 +209,4 @@ int remove_phb_dynamic(struct pci_contro
 	return 0;
 }
 EXPORT_SYMBOL_GPL(remove_phb_dynamic);
+#endif

---
Regards--
Subrata