diff options
| author | Paul Mundt | 2010-01-19 05:49:19 +0100 |
|---|---|---|
| committer | Paul Mundt | 2010-01-19 05:49:19 +0100 |
| commit | acf2c9685fb8295cb62a623d7358a1cfde8b07ea (patch) | |
| tree | 417313447aa8da946c74a5afcf1085c7b1744fb6 /arch/sh/include/asm/io.h | |
| parent | sh: Prevent 64-bit pgprot clobbering across ioremap implementations. (diff) | |
| download | kernel-qcow2-linux-acf2c9685fb8295cb62a623d7358a1cfde8b07ea.tar.gz kernel-qcow2-linux-acf2c9685fb8295cb62a623d7358a1cfde8b07ea.tar.xz kernel-qcow2-linux-acf2c9685fb8295cb62a623d7358a1cfde8b07ea.zip | |
sh: Kill off duplicate address alignment in ioremap_fixed().
This is already taken care of in the top-level ioremap, and now that
no one should be calling ioremap_fixed() directly we can simply throw the
mapping displacement in as an additional argument.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/io.h')
| -rw-r--r-- | arch/sh/include/asm/io.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 13696dfccc16..70269813cef1 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -239,12 +239,14 @@ void __iomem *__ioremap_caller(unsigned long offset, unsigned long size, void __iounmap(void __iomem *addr); #ifdef CONFIG_IOREMAP_FIXED -extern void __iomem *ioremap_fixed(resource_size_t, unsigned long, pgprot_t); +extern void __iomem *ioremap_fixed(resource_size_t, unsigned long, + unsigned long, pgprot_t); extern int iounmap_fixed(void __iomem *); extern void ioremap_fixed_init(void); #else static inline void __iomem * -ioremap_fixed(resource_size t phys_addr, unsigned long size, pgprot_t prot) +ioremap_fixed(resource_size t phys_addr, unsigned long offset, + unsigned long size, pgprot_t prot) { BUG(); } |