Commit e08d0e8e authored by David S. Miller's avatar David S. Miller

Use pci_memspace_mask instead of hard-coded

value 0xffffffff.
parent 455db04b
...@@ -418,7 +418,7 @@ static int __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vm ...@@ -418,7 +418,7 @@ static int __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vm
enum pci_mmap_state mmap_state) enum pci_mmap_state mmap_state)
{ {
unsigned long user_offset = vma->vm_pgoff << PAGE_SHIFT; unsigned long user_offset = vma->vm_pgoff << PAGE_SHIFT;
unsigned long user32 = user_offset & 0xffffffffUL; unsigned long user32 = user_offset & pci_memspace_mask;
unsigned long largest_base, this_base, addr32; unsigned long largest_base, this_base, addr32;
int i; int i;
...@@ -448,7 +448,7 @@ static int __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vm ...@@ -448,7 +448,7 @@ static int __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vm
this_base = rp->start; this_base = rp->start;
addr32 = (this_base & PAGE_MASK) & 0xffffffffUL; addr32 = (this_base & PAGE_MASK) & pci_memspace_mask;
if (mmap_state == pci_mmap_io) if (mmap_state == pci_mmap_io)
addr32 &= 0xffffff; addr32 &= 0xffffff;
...@@ -464,7 +464,7 @@ static int __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vm ...@@ -464,7 +464,7 @@ static int __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vm
if (mmap_state == pci_mmap_io) if (mmap_state == pci_mmap_io)
vma->vm_pgoff = (((largest_base & ~0xffffffUL) | user32) >> PAGE_SHIFT); vma->vm_pgoff = (((largest_base & ~0xffffffUL) | user32) >> PAGE_SHIFT);
else else
vma->vm_pgoff = (((largest_base & ~0xffffffffUL) | user32) >> PAGE_SHIFT); vma->vm_pgoff = (((largest_base & ~(pci_memspace_mask)) | user32) >> PAGE_SHIFT);
return 0; return 0;
} }
......
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