From 960d583996863b2e83e437984007c03eefb91808 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 30 Mar 2007 10:34:44 -0600 Subject: [PATCH] --- yaml --- r: 54513 b: refs/heads/master c: 2cb22e23a5fcbcac2de49493aa57c7694028a06a h: refs/heads/master i: 54511: fbdc80ddc9e713c5c818ede0c8949d8ac895e6a6 v: v3 --- [refs] | 2 +- trunk/arch/ia64/pci/pci.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7f07548fc1f4..acc1548ed4b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b50ffb0c0281bc5a08ccd56ae9bb84296c28f38 +refs/heads/master: 2cb22e23a5fcbcac2de49493aa57c7694028a06a diff --git a/trunk/arch/ia64/pci/pci.c b/trunk/arch/ia64/pci/pci.c index 0e83f3b419b5..9f635896d252 100644 --- a/trunk/arch/ia64/pci/pci.c +++ b/trunk/arch/ia64/pci/pci.c @@ -659,8 +659,6 @@ pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma) return -EINVAL; prot = phys_mem_access_prot(NULL, vma->vm_pgoff, size, vma->vm_page_prot); - if (pgprot_val(prot) != pgprot_val(pgprot_noncached(vma->vm_page_prot))) - return -EINVAL; addr = pci_get_legacy_mem(bus); if (IS_ERR(addr))