* [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI
@ 2012-02-26 23:24 Paul Gortmaker
2012-02-27 15:20 ` James Bottomley
0 siblings, 1 reply; 3+ messages in thread
From: Paul Gortmaker @ 2012-02-26 23:24 UTC (permalink / raw)
To: JBottomley, jejb, kyle, deller
Cc: linux-parisc, mst, linux-kernel, linux-next, Paul Gortmaker,
Randy Dunlap
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI
2012-02-26 23:24 [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI Paul Gortmaker
@ 2012-02-27 15:20 ` James Bottomley
2012-02-27 16:12 ` Paul Gortmaker
0 siblings, 1 reply; 3+ messages in thread
From: James Bottomley @ 2012-02-27 15:20 UTC (permalink / raw)
To: Paul Gortmaker
Cc: jejb, kyle, deller, linux-parisc, mst, linux-kernel, linux-next,
Randy Dunlap
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI
2012-02-27 15:20 ` James Bottomley
@ 2012-02-27 16:12 ` Paul Gortmaker
0 siblings, 0 replies; 3+ messages in thread
From: Paul Gortmaker @ 2012-02-27 16:12 UTC (permalink / raw)
To: James Bottomley
Cc: jejb, kyle, deller, linux-parisc, mst, linux-kernel, linux-next,
Randy Dunlap
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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-27 16:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-26 23:24 [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI Paul Gortmaker
2012-02-27 15:20 ` James Bottomley
2012-02-27 16:12 ` Paul Gortmaker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).