diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-05 20:59:27 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-05 20:59:27 +0100 |
| commit | 3603ab2b62ad8372fc93816b080b370dd55d7cec (patch) | |
| tree | e9012ae43fe5988c288074ee12fc4a0fc2f6b63a /include/asm-arm/mach | |
| parent | [ARM] mm 9: add additional device memory types (diff) | |
| download | linux-dev-3603ab2b62ad8372fc93816b080b370dd55d7cec.tar.xz linux-dev-3603ab2b62ad8372fc93816b080b370dd55d7cec.zip | |
[ARM] mm 10: allow memory type to be specified with ioremap
__ioremap() took a set of page table flags (specifically the cacheable
and bufferable bits) to control the mapping type. However, with
the advent of ARMv6, this is far too limited.
Replace the page table flags with a memory type index, so that the
desired attributes can be selected from the mem_type table.
Finally, to prevent silent miscompilation due to the differing
arguments, rename the __ioremap() and __ioremap_pfn() functions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/mach')
| -rw-r--r-- | include/asm-arm/mach/map.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h index 8afef40730af..7ef3c8390180 100644 --- a/include/asm-arm/mach/map.h +++ b/include/asm-arm/mach/map.h @@ -9,6 +9,8 @@ * * Page table mapping constructs and function prototypes */ +#include <asm/io.h> + struct map_desc { unsigned long virtual; unsigned long pfn; @@ -16,10 +18,7 @@ struct map_desc { unsigned int type; }; -#define MT_DEVICE 0 -#define MT_DEVICE_NONSHARED 1 -#define MT_DEVICE_CACHED 2 -#define MT_DEVICE_IXP2000 3 +/* types 0-3 are defined in asm/io.h */ #define MT_CACHECLEAN 4 #define MT_MINICLEAN 5 #define MT_LOW_VECTORS 6 |