diff options
| author | James Hogan <james.hogan@imgtec.com> | 2012-10-23 10:21:57 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 16:06:57 +0200 |
| commit | 9b04ebd1584766229c58fedaa8fe4dfff575ac3a (patch) | |
| tree | 21bd46274bcdb0ed9e3167d85a0301fe546f2ccc | |
| parent | 6f0c0580b70c89094b3422ba81118c7b959c7556 (diff) | |
| download | op-kernel-dev-9b04ebd1584766229c58fedaa8fe4dfff575ac3a.zip op-kernel-dev-9b04ebd1584766229c58fedaa8fe4dfff575ac3a.tar.gz | |
asm-generic/io.h: remove asm/cacheflush.h include
Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
cacheflush.h being able to use I/O functions like readl and writel due
to circular include dependencies. It doesn't appear as if anything from
cacheflush.h is actually used by the generic io.h, so remove the
include.
I've compile tested a defconfig compilation of blackfin, openrisc (which
needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
definitions), and xtensa.
Other architectures which use asm-generic/io.h are score and unicore32,
and looking at their io.h I don't see any obvious problems.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Jonas Bonn <jonas@southpole.se>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/openrisc/include/asm/io.h | 1 | ||||
| -rw-r--r-- | include/asm-generic/io.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h index 07f5299..7c69139 100644 --- a/arch/openrisc/include/asm/io.h +++ b/arch/openrisc/include/asm/io.h @@ -30,6 +30,7 @@ #define PIO_MASK 0 #include <asm-generic/io.h> +#include <asm/pgtable.h> extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size, pgprot_t prot); diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 448303b..616eea5 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -12,7 +12,6 @@ #define __ASM_GENERIC_IO_H #include <asm/page.h> /* I/O is all done through memory accesses */ -#include <asm/cacheflush.h> #include <linux/types.h> #ifdef CONFIG_GENERIC_IOMAP |
