[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070211001509.GA8055@osiris.ibm.com>
Date: Sun, 11 Feb 2007 01:15:09 +0100
From: Heiko Carstens <heiko.carstens@...ibm.com>
To: Tejun Heo <htejun@...il.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
Jeff Garzik <jgarzik@...ox.com>, linux-kernel@...r.kernel.org,
linux-s390@...r.kernel.org
Subject: Re: [PATCH] iomap: make PCI iomap stuff excluded when PCI isn't configured
On Sat, Feb 10, 2007 at 05:14:13PM -0500, Tejun Heo wrote:
> Heiko Carstens wrote:
> >On Sat, Feb 10, 2007 at 12:43:16PM -0500, Tejun Heo wrote:
> \>> Heiko, how about this? Does it fix s390?
> >Unfortunately not. Now I get
> > CC lib/iomap.o
> >lib/iomap.c: In function 'devm_ioport_map_release':
> >lib/iomap.c:270: warning: implicit declaration of function 'ioport_unmap'
> >lib/iomap.c: In function 'devm_ioport_map':
> >lib/iomap.c:297: warning: implicit declaration of function 'ioport_map'
> >lib/iomap.c:297: warning: assignment makes pointer from integer without a cast
>
> I think an arch needs to support ioport_map/unmap and noncoherent dma
> (just alias to coherent interface on x86/amd64) interface whether PCI is
> implemented or not. No?
I sent a patch earlier which "fixes" at least the dma stuff by adding some
more defines to asm-generic/dma-mapping-broken.h
The patch below (on top of your latest one) makes sure s390 builds at
least again until all this got sorted out.
---
Hack to make s390 build again.
Signed-off-by: Heiko Carstens <heiko.carstens@...ibm.com>
---
include/asm-s390/io.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Index: linux-2.6/include/asm-s390/io.h
===================================================================
--- linux-2.6.orig/include/asm-s390/io.h
+++ linux-2.6/include/asm-s390/io.h
@@ -61,6 +61,20 @@ static inline void * ioremap_nocache (un
extern void iounmap(void *addr);
/*
+ * FIXME: remove ioport stuff asap again.
+ */
+static inline void __iomem *ioport_map(unsigned long port, unsigned int size)
+{
+ BUG();
+ return NULL;
+}
+
+static inline void ioport_unmap(void __iomem *addr)
+{
+ BUG();
+}
+
+/*
* IO bus memory addresses are also 1:1 with the physical address
*/
#define virt_to_bus virt_to_phys
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists