Commit ad41a1e0 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 8357422d 5272a753
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment