2003-06-11 08:08:37

by Marc Zyngier

Subject: [PATCH][ALPHA] PCI domains warning

Ivan,

The included patch fixes a warning about pci_domain_nr being doubly
defined whet CONFIG_PCI_DOMAINS is not set (defined to 0 in
include/linux/pci.h and unconditionnaly defined in
include/asm-alpha/pci.h).

It was preventing a Jensen kernel to be built.

Thanks,

M.

===== include/asm-alpha/pci.h 1.14 vs edited =====
--- 1.14/include/asm-alpha/pci.h Mon Jun 9 18:25:23 2003
+++ edited/include/asm-alpha/pci.h Wed Jun 11 09:41:37 2003
@@ -192,7 +192,9 @@
pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
struct resource *res);

+#ifdef CONFIG_PCI_DOMAINS
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
+#endif

#endif /* __KERNEL__ */


--
Places change, faces change. Life is so very strange.

2003-06-11 09:59:36

by Ivan Kokshaysky

Subject: Re: [PATCH][ALPHA] PCI domains warning

On Wed, Jun 11, 2003 at 10:19:34AM +0200, Marc Zyngier wrote:
> +#ifdef CONFIG_PCI_DOMAINS
> #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
> +#endif

Alternatively, we can set CONFIG_PCI_DOMAINS=y unconditionally to
avoid ifdefs - jensen has dummy PCI infrastructure anyway.

Ivan.

--- 2.5/arch/alpha/Kconfig Wed Jun 11 13:13:56 2003
+++ linux/arch/alpha/Kconfig Wed Jun 11 13:54:37 2003
@@ -297,7 +297,7 @@ config PCI

config PCI_DOMAINS
bool
- default PCI
+ default y

config ALPHA_CORE_AGP
bool