aboutsummaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:17:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:17:19 -0700
commitad41a1e0cab07c5125456e8d38e5b1ab148d04aa (patch)
tree2d0757baeb75823a2f0488e9f35b0ca03f975337 /arch/cris
parent8357422d4bf33bc2c35884d4016c3fc9efbbc1d2 (diff)
parent5272a7534afc5e888e702ca2c6f439a6c62f3752 (diff)
Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris
* 'io_remap_pfn_range' of git://www.jni.nu/cris: CRIS: Define io_remap_pfn_range as remap_pfn_range
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/include/asm/pgtable.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h
index 99ea6cd1b14..f63d6fccbc6 100644
--- a/arch/cris/include/asm/pgtable.h
+++ b/arch/cris/include/asm/pgtable.h
@@ -260,6 +260,9 @@ static inline pgd_t * pgd_offset(const struct mm_struct *mm, unsigned long addre
#define pgd_ERROR(e) \
printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), pgd_val(e))
+#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
+ remap_pfn_range(vma, vaddr, pfn, size, prot)
+
extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* defined in head.S */