Skip to content

Commit

Permalink
Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris
Browse files Browse the repository at this point in the history
* 'io_remap_pfn_range' of git://www.jni.nu/cris:
  CRIS: Define io_remap_pfn_range as remap_pfn_range
  • Loading branch information
Linus Torvalds committed Aug 12, 2010
2 parents 8357422 + 5272a75 commit ad41a1e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/cris/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit ad41a1e

Please sign in to comment.