summaryrefslogtreecommitdiff
path: root/arch/arm/mm/mm.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 05:12:24 (GMT)
committerOlof Johansson <olof@lixom.net>2011-12-20 05:13:41 (GMT)
commit844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch)
treefdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/mm/mm.h
parent5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff)
parenta53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff)
downloadlinux-fsl-qoriq-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.xz
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits) MAINTAINERS: add maintainer entry for Picochip picoxcell ARM: picoxcell: move io mappings to common.c ARM: picoxcell: don't reserve irq_descs ARM: picoxcell: remove mach/memory.h Conflicts: arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm/mm/mm.h')
-rw-r--r--arch/arm/mm/mm.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index ad7cce3..70f6d3ea 100644
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -21,6 +21,20 @@ const struct mem_type *get_mem_type(unsigned int type);
extern void __flush_dcache_page(struct address_space *mapping, struct page *page);
+/*
+ * ARM specific vm_struct->flags bits.
+ */
+
+/* (super)section-mapped I/O regions used by ioremap()/iounmap() */
+#define VM_ARM_SECTION_MAPPING 0x80000000
+
+/* permanent static mappings from iotable_init() */
+#define VM_ARM_STATIC_MAPPING 0x40000000
+
+/* mapping type (attributes) for permanent static mappings */
+#define VM_ARM_MTYPE(mt) ((mt) << 20)
+#define VM_ARM_MTYPE_MASK (0x1f << 20)
+
#endif
#ifdef CONFIG_ZONE_DMA