[PATCH] parisc: fix longstanding build failures for !CONFIG_PCI

[PATCH] parisc: fix longstanding build failures for !CONFIG_PCI

[Paul Gortmaker]

Upstream commit fea80311a939a746533a6d7e7c3183729d6a3faf

    "iomap: make IOPORT/PCI mapping functions conditional"

introduced an arch independent stub for pci_iounmap() but the
parisc had its own that was unconditionally built.  So builds
since v3.0-3553-gfea8031 have been failing with:

arch/parisc/lib/iomap.c:439:6: error: redefinition of 'pci_iounmap'
include/asm-generic/iomap.h:75:20: note: previous definition of 'pci_iounmap' was here

Making the parisc one specific to CONFIG_PCI fixes the problem.

CC: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[This fixes the linux-next builds that have been consistently failing
 since last July -- http://kisskb.ellerman.id.au/kisskb/target/2069/ ]

diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
index fb8e10a..dc0a2c3 100644
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
@@ -436,12 +436,15 @@ void ioport_unmap(void __iomem *addr)
 	}
 }
 
+#ifdef CONFIG_PCI
 void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
 {
 	if (!INDIRECT_ADDR(addr)) {
 		iounmap(addr);
 	}
 }
+EXPORT_SYMBOL(pci_iounmap);
+#endif
 
 EXPORT_SYMBOL(ioread8);
 EXPORT_SYMBOL(ioread16);
@@ -461,4 +464,3 @@ EXPORT_SYMBOL(iowrite16_rep);
 EXPORT_SYMBOL(iowrite32_rep);
 EXPORT_SYMBOL(ioport_map);
 EXPORT_SYMBOL(ioport_unmap);
-EXPORT_SYMBOL(pci_iounmap);
-- 
1.7.9.1

Re: [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI

[James Bottomley]

On Sun, 2012-02-26 at 18:24 -0500, Paul Gortmaker wrote:
> Upstream commit fea80311a939a746533a6d7e7c3183729d6a3faf
> 
>     "iomap: make IOPORT/PCI mapping functions conditional"
> 
> introduced an arch independent stub for pci_iounmap() but the
> parisc had its own that was unconditionally built.  So builds
> since v3.0-3553-gfea8031 have been failing with:
> 
> arch/parisc/lib/iomap.c:439:6: error: redefinition of 'pci_iounmap'
> include/asm-generic/iomap.h:75:20: note: previous definition of 'pci_iounmap' was here
> 
> Making the parisc one specific to CONFIG_PCI fixes the problem.
> 
> CC: Randy Dunlap <rdunlap@xenotime.net>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> 
> [This fixes the linux-next builds that have been consistently failing
>  since last July -- http://kisskb.ellerman.id.au/kisskb/target/2069/ ]
> 
> diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
> index fb8e10a..dc0a2c3 100644
> --- a/arch/parisc/lib/iomap.c
> +++ b/arch/parisc/lib/iomap.c

This should break more than just PARISC ... any non-PCI build for any
arch should be broken, so this is the proposed generic fix:

http://marc.info/?l=linux-parisc&m=132794183521355

James

Re: [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI

[Paul Gortmaker]

On 12-02-27 10:20 AM, James Bottomley wrote:
> On Sun, 2012-02-26 at 18:24 -0500, Paul Gortmaker wrote:
>> Upstream commit fea80311a939a746533a6d7e7c3183729d6a3faf
>>
>>     "iomap: make IOPORT/PCI mapping functions conditional"
>>
>> introduced an arch independent stub for pci_iounmap() but the
>> parisc had its own that was unconditionally built.  So builds
>> since v3.0-3553-gfea8031 have been failing with:
>>
>> arch/parisc/lib/iomap.c:439:6: error: redefinition of 'pci_iounmap'
>> include/asm-generic/iomap.h:75:20: note: previous definition of 'pci_iounmap' was here
>>
>> Making the parisc one specific to CONFIG_PCI fixes the problem.
>>
>> CC: Randy Dunlap <rdunlap@xenotime.net>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>> ---
>>
>> [This fixes the linux-next builds that have been consistently failing
>>  since last July -- http://kisskb.ellerman.id.au/kisskb/target/2069/ ]
>>
>> diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
>> index fb8e10a..dc0a2c3 100644
>> --- a/arch/parisc/lib/iomap.c
>> +++ b/arch/parisc/lib/iomap.c
> 
> This should break more than just PARISC ... any non-PCI build for any
> arch should be broken, so this is the proposed generic fix:
> 
> http://marc.info/?l=linux-parisc&m=132794183521355

Similar comments here, it would have saved me looking at it at all
if this was simply present in linux-next anytime after last July.

Thanks,
Paul.

> 
> James
> 
>