Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad41a1e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/cris/include/asm/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -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 */