ia64: Use generic pci_mmap_resource_range()

Now that we eliminated the different behaviour in separately-reviewable
commits, we can switch IA64 to the generic implementation.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Tested-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index fc60b3d139f4d27c23386f09f80aaba2f2f900e6..6459f2d46200581b2b5288a54aab090cde2d20d1 100644 (file)
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -51,6 +51,7 @@ extern unsigned long ia64_max_iommu_merge_mask;
 #define PCI_DMA_BUS_IS_PHYS    (ia64_max_iommu_merge_mask == ~0UL)
 
 #define HAVE_PCI_MMAP
+#define ARCH_GENERIC_PCI_MMAP_RESOURCE
 #define arch_can_pci_mmap_wc() 1
 
 #define HAVE_PCI_LEGACY

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 7438e8c84cdde56ce04351a3a75f19ec3730158d..4068bde623dc3dd40c1dc81ccc021d6fdc6303a2 100644 (file)
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -418,36 +418,6 @@ pcibios_align_resource (void *data, const struct resource *res,
        return res->start;
 }
 
-int
-pci_mmap_page_range (struct pci_dev *dev, int bar,
-                    struct vm_area_struct *vma,
-                    enum pci_mmap_state mmap_state, int write_combine)
-{
-       /*
-        * I/O space cannot be accessed via normal processor loads and
-        * stores on this platform.
-        */
-       if (mmap_state == pci_mmap_io)
-               /*
-                * XXX we could relax this for I/O spaces for which ACPI
-                * indicates that the space is 1-to-1 mapped.  But at the
-                * moment, we don't support multiple PCI address spaces and
-                * the legacy I/O space is not 1-to-1 mapped, so this is moot.
-                */
-               return -EINVAL;
-
-       if (write_combine)
-               vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-       else
-               vma->vm_page_prot = pgprot_device(vma->vm_page_prot);
-
-       if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-                            vma->vm_end - vma->vm_start, vma->vm_page_prot))
-               return -EAGAIN;
-
-       return 0;
-}
-
 /**
  * ia64_pci_get_legacy_mem - generic legacy mem routine
  * @bus: bus to get legacy memory base address for