* [PATCH][ALPHA] PCI domains warning
@ 2003-06-11 8:19 Marc Zyngier
2003-06-11 10:12 ` Ivan Kokshaysky
0 siblings, 1 reply; 2+ messages in thread
From: Marc Zyngier @ 2003-06-11 8:19 UTC (permalink / raw)
To: ink; +Cc: torvalds, linux-kernel
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH][ALPHA] PCI domains warning
2003-06-11 8:19 [PATCH][ALPHA] PCI domains warning Marc Zyngier
@ 2003-06-11 10:12 ` Ivan Kokshaysky
0 siblings, 0 replies; 2+ messages in thread
From: Ivan Kokshaysky @ 2003-06-11 10:12 UTC (permalink / raw)
To: Marc Zyngier; +Cc: torvalds, linux-kernel, Richard Henderson
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-06-11 9:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-06-11 8:19 [PATCH][ALPHA] PCI domains warning Marc Zyngier
2003-06-11 10:12 ` Ivan Kokshaysky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®