diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:17:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:17:19 -0400 |
| commit | ad41a1e0cab07c5125456e8d38e5b1ab148d04aa (patch) | |
| tree | 2d0757baeb75823a2f0488e9f35b0ca03f975337 /arch/cris | |
| parent | 8357422d4bf33bc2c35884d4016c3fc9efbbc1d2 (diff) | |
| parent | 5272a7534afc5e888e702ca2c6f439a6c62f3752 (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.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h index 99ea6cd1b143..f63d6fccbc6c 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 | |||
| 260 | #define pgd_ERROR(e) \ | 260 | #define pgd_ERROR(e) \ |
| 261 | printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), pgd_val(e)) | 261 | printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), pgd_val(e)) |
| 262 | 262 | ||
| 263 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
| 264 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
| 265 | |||
| 263 | 266 | ||
| 264 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* defined in head.S */ | 267 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* defined in head.S */ |
| 265 | 268 | ||