public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: JBottomley@parallels.com, jejb@parisc-linux.org,
	kyle@mcmartin.ca, deller@gmx.de
Cc: linux-parisc@vger.kernel.org, mst@redhat.com,
	linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
	Paul Gortmaker <paul.gortmaker@windriver.com>,
	Randy Dunlap <rdunlap@xenotime.net>
Subject: [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI
Date: Sun, 26 Feb 2012 18:24:37 -0500	[thread overview]
Message-ID: <1330298677-17205-1-git-send-email-paul.gortmaker@windriver.com> (raw)

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


             reply	other threads:[~2012-02-26 23:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-26 23:24 Paul Gortmaker [this message]
2012-02-27 15:20 ` [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI James Bottomley
2012-02-27 16:12   ` Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330298677-17205-1-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=JBottomley@parallels.com \
    --cc=deller@gmx.de \
    --cc=jejb@parisc-linux.org \
    --cc=kyle@mcmartin.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-parisc@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=rdunlap@xenotime.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox