diff options
| author |   Chris Zankel <czankel@tensilica.com> | 2005-09-22 21:44:23 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-22 22:17:37 -0700 |
| commit | 288a60cf4d7cc35f84f46cd8ffd0b34f9d8e7346 (patch) | |
| tree | 24691394b7e1aaa0b8e9a64f0e1723df3f3974bb /arch/xtensa/kernel/pci.c | |
| parent | [PATCH] uml: replace printk with "stack-friendly" printf - to report console failure (diff) | |
| download | linux-dev-288a60cf4d7cc35f84f46cd8ffd0b34f9d8e7346.tar.xz linux-dev-288a60cf4d7cc35f84f46cd8ffd0b34f9d8e7346.zip | |
[PATCH] xtensa: remove io_remap_page_range and minor clean-ups
Remove io_remap_page_range() from all of Linux 2.6.x (as requested and
suggested by Randy Dunlap) and minor clean-ups.
Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/xtensa/kernel/pci.c')
| -rw-r--r-- | arch/xtensa/kernel/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index 09887c96e9a1..de19501aa809 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c @@ -402,8 +402,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, __pci_mmap_set_flags(dev, vma, mmap_state); __pci_mmap_set_pgprot(dev, vma, mmap_state, write_combine); - ret = io_remap_page_range(vma, vma->vm_start, vma->vm_pgoff<<PAGE_SHIFT, - vma->vm_end - vma->vm_start, vma->vm_page_prot); + ret = io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, + vma->vm_end - vma->vm_start,vma->vm_page_prot); return ret; } |