diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:56:17 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:56:17 -0400 |
| commit | d29182534c5f39ff899763d1e0982d8f33791d6f (patch) | |
| tree | 69fd6a52145b22650799493b54e8795e988a89af /arch/ia64/pci/pci.c | |
| parent | b643b0fdbc59cf6bbb086974b29d2571e9e9f646 (diff) | |
| parent | ddd83eff58888928115b3e225a46d3c686e64594 (diff) | |
Pull mem-attribute into release branch
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 0e83f3b419b5..9f635896d252 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -659,8 +659,6 @@ pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma) | |||
| 659 | return -EINVAL; | 659 | return -EINVAL; |
| 660 | prot = phys_mem_access_prot(NULL, vma->vm_pgoff, size, | 660 | prot = phys_mem_access_prot(NULL, vma->vm_pgoff, size, |
| 661 | vma->vm_page_prot); | 661 | vma->vm_page_prot); |
| 662 | if (pgprot_val(prot) != pgprot_val(pgprot_noncached(vma->vm_page_prot))) | ||
| 663 | return -EINVAL; | ||
| 664 | 662 | ||
| 665 | addr = pci_get_legacy_mem(bus); | 663 | addr = pci_get_legacy_mem(bus); |
| 666 | if (IS_ERR(addr)) | 664 | if (IS_ERR(addr)) |