]> git.baikalelectronics.ru Git - kernel.git/commit
[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Mon, 30 Jan 2012 16:40:47 +0000 (10:40 -0600)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 27 Feb 2012 15:43:30 +0000 (09:43 -0600)
commit717b17a8be21c30d5bcec0eca8aa702707df5efa
treefdfe0aa6e408bbec38e33e49703a284eeaf7931d
parent416d19c78c3c05ad8aacacaaec52aa5b7b000a51
[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional

The problem in

commit 85acd933d825a20b1deb3e923c4e06389c9b5476
Author: Randy Dunlap <rdunlap@xenotime.net>
Date:   Sun Jul 24 11:39:14 2011 -0700

    iomap: make IOPORT/PCI mapping functions conditional

is that if your architecture supplies pci_iomap/pci_iounmap, it expects
always to supply them.  Adding empty body defitions in the !CONFIG_PCI
case, which is what this patch does, breaks the parisc compile because
the functions become doubly defined.  It took us a while to spot this,
because we don't actually build !CONFIG_PCI very often (only if someone
is brave enough to test the snake/asp machines).

Since the note in the commit log says this is to fix a
CONFIG_GENERIC_IOMAP issue (which it does because CONFIG_GENERIC_IOMAP
supplies pci_iounmap only if CONFIG_PCI is set), there should actually
have been a condition upon this.  This should make sure no other
architecture's !CONFIG_PCI compile breaks in the same way as parisc.

The fix had to be updated to take account of the GENERIC_PCI_IOMAP
separation.

Reported-by: Rolf Eike Beer <eike@sf-mail.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
include/asm-generic/iomap.h
include/asm-generic/pci_iomap.h