diff options
| author |   James Hogan <james.hogan@imgtec.com> | 2015-03-23 11:17:56 +0000 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2015-03-23 12:32:37 +0000 |
| commit | 0164a711c97b0beeb7994b7d32ccddf586b6d81a (patch) | |
| tree | 77f2335e48a7faf8d469fd91171546b93b43c841 /arch/metag/include/asm/io.h | |
| parent | Linux 4.0-rc3 (diff) | |
| download | linux-dev-0164a711c97b0beeb7994b7d32ccddf586b6d81a.tar.xz linux-dev-0164a711c97b0beeb7994b7d32ccddf586b6d81a.zip | |
metag: Fix ioremap_wc/ioremap_cached build errors
When ioremap_wc() or ioremap_cached() are used without first including
asm/pgtable.h, the _PAGE_CACHEABLE or _PAGE_WR_COMBINE definitions
aren't found, resulting in build errors like the following (in
next-20150323 due to "lib: devres: add a helper function for
ioremap_wc"):
lib/devres.c: In function ‘devm_ioremap_wc’:
lib/devres.c:91: error: ‘_PAGE_WR_COMBINE’ undeclared
We can't easily include asm/pgtable.h in asm/io.h due to dependency
problems, so split out the _PAGE_* definitions from asm/pgtable.h into a
separate asm/pgtable-bits.h header (as a couple of other architectures
already do), and include that in io.h instead.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-metag@vger.kernel.org
Cc: Abhilash Kesavan <a.kesavan@samsung.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/metag/include/asm/io.h')
| -rw-r--r-- | arch/metag/include/asm/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/metag/include/asm/io.h b/arch/metag/include/asm/io.h index 9359e5048442..d5779b0ec573 100644 --- a/arch/metag/include/asm/io.h +++ b/arch/metag/include/asm/io.h @@ -2,6 +2,7 @@ #define _ASM_METAG_IO_H #include <linux/types.h> +#include <asm/pgtable-bits.h> #define IO_SPACE_LIMIT 0 |