diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-10-23 16:08:08 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-10-23 16:08:08 +0100 |
| commit | e77570543562afdc54394b3a1a66e21b9e9d8f9b (patch) | |
| tree | d5568bc1c2a6c3398975ed5c5c8c89abdbc7cb46 | |
| parent | f9f8f6979a2b8ca7e26dae102f7e1015426d9219 (diff) | |
fixupsleg-20131023.0
| -rw-r--r-- | arch/arm/include/asm/io.h | 7 | ||||
| -rw-r--r-- | arch/arm64/kernel/setup.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 826cd88fd798..5145667d1582 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -328,7 +328,12 @@ extern void _memset_io(volatile void __iomem *, int, size_t); */ #define ioremap(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE) #define ioremap_nocache(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE) -#define ioremap_cached(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED) +/* + * BOZO: is this just mis-named as ioremap_cached()? + * renaming it to ioremap_cache() to find out for now. + #define ioremap_cached(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED) + */ +#define ioremap_cache(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED) #define ioremap_wc(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_WC) #define iounmap __arm_iounmap diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 00d89daee44a..f82cb1a2b3cb 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -46,6 +46,7 @@ #include <linux/acpi.h> #endif +#include <asm/fixmap.h> #include <asm/cputype.h> #include <asm/elf.h> #include <asm/cputable.h> |