Re: [PATCH] mm: make ioremap_prot() take a pgprot.

[Andrew Morton <akpm@linux-foundation.org>]

On Wed, 3 Nov 2010 05:31:03 +0900
Paul Mundt <lethal@linux-sh.org> wrote:

> The current definition of ioremap_prot() takes an unsigned long for the
> page flags and then converts to/from a pgprot as necessary. This is
> unfortunately not sufficient for the SH-X2 TLB case which has a 64-bit
> pgprot and a 32-bit unsigned long.
> 
> An inspection of the tree shows that tile and cris also have their
> own equivalent routines that are using the pgprot_t but do not set
> HAVE_IOREMAP_PROT, both of which could trivially be adapted.
> 
> After cris/tile are updated there would also be enough critical mass to
> move the powerpc devm_ioremap_prot() in to the generic lib/devres.c.

In file included from sound/drivers/mpu401/mpu401_uart.c:31:
arch/x86/include/asm/io.h:199: error: syntax error before 'pgprot_t'
arch/x86/include/asm/io.h:199: warning: function declaration isn't a prototype

because asm/io.h now needs asm/pgtable.h for pgprot_t.

I tried that:

--- a/arch/powerpc/include/asm/io.h~mm-make-ioremap_prot-take-a-pgprot-fix
+++ a/arch/powerpc/include/asm/io.h
@@ -27,6 +27,7 @@ extern int check_legacy_ioport(unsigned 
 #include <asm/synch.h>
 #include <asm/delay.h>
 #include <asm/mmu.h>
+#include <asm/pgtable.h>
 
 #include <asm-generic/iomap.h>
 
--- a/arch/x86/include/asm/io.h~mm-make-ioremap_prot-take-a-pgprot-fix
+++ a/arch/x86/include/asm/io.h
@@ -40,6 +40,7 @@
 #include <linux/compiler.h>
 #include <asm-generic/int-ll64.h>
 #include <asm/page.h>
+#include <asm/pgtable.h>
 
 #include <xen/xen.h>
 
and it blew up because pgtable.h needs spinlock.h for spinlock_t.

Gave up.