diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-25 10:15:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-25 10:20:21 +0100 |
| commit | 56a459314a982bae75b9bce64bcca853d378ca7e (patch) | |
| tree | 07d9121fb08229ebe2ac2f4420cec70434c7bbba /arch/arm/mm | |
| parent | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (diff) | |
| parent | 5c651ffaee6f07aa1f5e6d0763845a2ee606b6bd (diff) | |
| download | linux-56a459314a982bae75b9bce64bcca853d378ca7e.tar.gz linux-56a459314a982bae75b9bce64bcca853d378ca7e.tar.bz2 linux-56a459314a982bae75b9bce64bcca853d378ca7e.zip | |
Merge branch 'iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git into devel
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 6 | ||||
| -rw-r--r-- | arch/arm/mm/mmu.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 9f88dd3be601..0ab75c60f7cf 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -110,6 +110,12 @@ static int remap_area_pages(unsigned long start, unsigned long pfn, return err; } +int ioremap_page(unsigned long virt, unsigned long phys, + const struct mem_type *mtype) +{ + return remap_area_pages(virt, __phys_to_pfn(phys), PAGE_SIZE, mtype); +} +EXPORT_SYMBOL(ioremap_page); void __check_kvm_seq(struct mm_struct *mm) { diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index e6344ece00ce..70974d75a075 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -255,6 +255,7 @@ const struct mem_type *get_mem_type(unsigned int type) { return type < ARRAY_SIZE(mem_types) ? &mem_types[type] : NULL; } +EXPORT_SYMBOL(get_mem_type); /* * Adjust the PMD section entries according to the CPU in use. |