9 files changed, 0 insertions, 25 deletions

diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index de606dfa8db9..302fc1401547 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -702,7 +702,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         /*
          * Mark this as IO
          */
-        vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         if (remap_pfn_range(vma, vma->vm_start, phys,
diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index 24bc149889b6..1e9d062103ae 100644
--- a/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@ -27,8 +27,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         /* Leave vm_pgoff as-is, the PCI space address is the physical
          * address on this platform.
          */
-        vma->vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);
-
         prot = pgprot_val(vma->vm_page_prot);
         vma->vm_page_prot = __pgprot(prot);
 
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 7852827a599b..a151f7a99f5e 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -285,8 +285,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         /* Leave vm_pgoff as-is, the PCI space address is the physical
          * address on this platform.
          */
-        vma->vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);
-
         prot = pgprot_val(vma->vm_page_prot);
         if (boot_cpu_data.x86 > 3)
                 prot |= _PAGE_PCD | _PAGE_PWT;
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 61dd8608da4f..77375a55da31 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -602,8 +602,6 @@ pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
          * Leave vm_pgoff as-is, the PCI space address is the physical
          * address on this platform.
          */
-        vma->vm_flags |= (VM_SHM | VM_RESERVED | VM_IO);
-
         if (write_combine && efi_range_is_wc(vma->vm_start,
                                              vma->vm_end - vma->vm_start))
                 vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
@@ -666,7 +664,6 @@ pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma)
 
         vma->vm_pgoff += (unsigned long)addr >> PAGE_SHIFT;
         vma->vm_page_prot = prot;
-        vma->vm_flags |= (VM_SHM | VM_RESERVED | VM_IO);
 
         if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
                             size, vma->vm_page_prot))
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index c858eb4bef17..b5431ccf1147 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -1654,7 +1654,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                 return -EINVAL;
 
         vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
         vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
                                                   vma->vm_page_prot,
                                                   mmap_state, write_combine);
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 5ad87c426bed..247937dd8b73 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -877,7 +877,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                 return -EINVAL;
 
         vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
         vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
                                                   vma->vm_page_prot,
                                                   mmap_state, write_combine);
diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c
index 2b87f82df135..2ab8f2be911e 100644
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -115,8 +115,6 @@ static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
 {
         struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
 
-        vma->vm_flags |= VM_SHM | VM_LOCKED;
-
         if ((vma->vm_end - vma->vm_start) > dp->size)
                 return -EINVAL;
 
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 809673a36f7a..d20accf9650d 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -1032,7 +1032,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                 return -EINVAL;
 
         vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
         vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
                                                   vma->vm_page_prot,
                                                   mmap_state, write_combine);
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index de19501aa809..c6f471b9eaa0 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -350,17 +350,6 @@ __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vma,
 }
 
 /*
- * Set vm_flags of VMA, as appropriate for this architecture, for a pci device
- * mapping.
- */
-static __inline__ void
-__pci_mmap_set_flags(struct pci_dev *dev, struct vm_area_struct *vma,
-                     enum pci_mmap_state mmap_state)
-{
-        vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
-}
-
-/*
  * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci
  * device mapping.
  */
@@ -399,7 +388,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         if (ret < 0)
                 return ret;
 
-        __pci_mmap_set_flags(dev, vma, mmap_state);
         __pci_mmap_set_pgprot(dev, vma, mmap_state, write_combine);
 
         ret = io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,